diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 9498ea52d..7b62ad04f 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -262,8 +262,12 @@ namespace MWClass
     {
         if(lockLevel!=0)
             ptr.getCellRef().setLockLevel(abs(lockLevel)); //Changes lock to locklevel, in positive
-        else
-            ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the original one
+        else {
+            if(abs(ptr.getCellRef().getLockLevel())!=0)
+                ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
+            else
+                ptr.getCellRef().setLockLevel(100); //There never was a locklevel, give it the default biggest one
+        }
     }
 
     void Container::unlock (const MWWorld::Ptr& ptr) const
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 12645c9f3..078889629 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -192,8 +192,12 @@ namespace MWClass
     {
         if(lockLevel!=0)
             ptr.getCellRef().setLockLevel(abs(lockLevel)); //Changes lock to locklevel, in positive
-        else
-            ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
+        else {
+            if(abs(ptr.getCellRef().getLockLevel())!=0)
+                ptr.getCellRef().setLockLevel(abs(ptr.getCellRef().getLockLevel())); //No locklevel given, just flip the origional one
+            else
+                ptr.getCellRef().setLockLevel(100);
+        }
     }
 
     void Door::unlock (const MWWorld::Ptr& ptr) const