diff --git a/ChangeLog b/ChangeLog
index ee4326d..cbb2e1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-13 Richard Frith-Macdonald  <rfm@gnu.org>
+
+        * SQLClient.m:
+	Fix tiny window in which a connection could be unlocked yet have
+	the flag set to say it is in a transaction (thus potentially
+	allowing a locking consistency error).
+
 2014-05-08 Richard Frith-Macdonald  <rfm@gnu.org>
 
 	* GNUmakefile: new subminor version for bugfix release 
diff --git a/SQLClient.h b/SQLClient.h
index d74c831..48efa3f 100644
--- a/SQLClient.h
+++ b/SQLClient.h
@@ -1134,7 +1134,7 @@ SQLCLIENT_PRIVATE
             selector: (SEL)aSelector
                 name: (NSString*)name;
 
-/** Posts a notification via the dastabase.  The name is an SQL identifier
+/** Posts a notification via the database.  The name is an SQL identifier
  * (for which observers may have registered) and the extra payload
  * information may be nil if not required.
  */
diff --git a/SQLClient.m b/SQLClient.m
index ce16ceb..a179c89 100644
--- a/SQLClient.m
+++ b/SQLClient.m
@@ -1079,8 +1079,8 @@ static unsigned int	maxConnections = 8;
 	}
       NS_HANDLER
 	{
-	  [lock unlock];
 	  _inTransaction = NO;
+	  [lock unlock];
 	  [localException raise];
 	}
       NS_ENDHANDLER