Index: /trunk/FACT++/src/datalogger.cc
===================================================================
--- /trunk/FACT++/src/datalogger.cc	(revision 12430)
+++ /trunk/FACT++/src/datalogger.cc	(revision 12431)
@@ -494,4 +494,10 @@
         return;
 
+    if (fServiceSubscriptions.find(server) == fServiceSubscriptions.end())
+    {
+      Error("Server " + server + " not found while removing service " + service);
+      return;
+    }
+
     if (fServiceSubscriptions[server].erase(service) != 1)
     {