diff --git a/.travis.yml b/.travis.yml
index d843dede..38b951d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,11 @@ xcode_scheme: MacPass
 language: objective-c
 
 before_install:
-  - carthage bootstrap --platform Mac
+  - carthage bootstrap --platform macOS
 
 after_success:
   - cd ./build/Build/Products/Release
-  - zip -9r MacPass-continuous.zip MacPass.app
+  - zip -9ry MacPass-continuous.zip MacPass.app
   - cd -
   - mv ./build/Build/Products/Release/MacPass-continuous.zip .
 
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 4495b51a..214ec6ae 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -412,11 +412,10 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
    [self saveDocument] is enqued so that dataOfType is called too late to actually save teh database.
    hence we need to get the ok from the NSDocument about the save, otherwise the lock fails!
    */
-  if(self.lockedForFileChange) {
-    // we have user interaction that cannot be dismissed, instead ignore locking!
-    return;
+  // only lock if we do not have user interaction that cannot be dismissed!
+  if(!self.lockedForFileChange) {
+    [self saveDocumentWithDelegate:self didSaveSelector:@selector(_lockDatabaseForDocument:didSave:contextInfo:) contextInfo:NULL];
   }
-  [self saveDocumentWithDelegate:self didSaveSelector:@selector(_lockDatabaseForDocument:didSave:contextInfo:) contextInfo:NULL];
 }
 
 - (void)_lockDatabaseForDocument:(NSDocument *)document didSave:(BOOL)didSave contextInfo:(void  *)contextInfo {