diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 1b547ce6..c1a41a3c 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -278,8 +278,8 @@ public class ObjectManager extends Manager {
 		objectAwareness.remove(object);
 		object.clearAware();
 		synchronized (database) {
-			database.remove(object.getObjectId());
-			database.save();
+			if (database.remove(object.getObjectId()) != null)
+				database.save();
 		}
 		synchronized (objectMap) {
 			objectMap.remove(object.getObjectId());