diff --git a/ChangeLog b/ChangeLog
index 5868c75..8971c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-12 Richard Frith-Macdonald  <rfm@gnu.org>
+
+        * SQLClient.m:
+	Fix error removing database observer when last name is removed.
+
 2014-03-05  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Postgres.m (backendExecute:):
diff --git a/SQLClient.m b/SQLClient.m
index af6d8d7..576de15 100644
--- a/SQLClient.m
+++ b/SQLClient.m
@@ -3499,6 +3499,10 @@ validName(NSString *name)
                 }
               name = [e nextObject];
             }
+          if ([set count] == 0)
+            {
+              NSMapRemove(_observers, (void*)anObserver);
+            }
         }
     }
   NS_HANDLER