diff --git a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
index a5707c2f6233a1de6d9d77a83f5377fbfd1c586e..856f25ef26b95e003f2f6d2639fd9ac2af3cbbbe 100644
--- a/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
+++ b/openbis-ipad/openBIS/openBIS/CISDOBAppDelegate.m
@@ -117,7 +117,7 @@
     if (managedObjectContext != nil) {
         if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
             // TODO Implement error handling
-            NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+            NSLog(@"Unresolved error -- could not save %@, %@", error, [error userInfo]);
             abort();
         } 
     }
@@ -142,6 +142,12 @@
         [[CISDOBIpadServiceManager alloc]
             initWithStoreUrl: storeUrl openbisUrl: openbisUrl trusted: YES error: &error];
     
+    if (!_serviceManager) {
+        // TODO Implement error handling
+        NSLog(@"Unresolved error -- could not create service manager %@, %@", error, [error userInfo]);
+        abort();
+    }
+    
     return _serviceManager;
 }