diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h
index 4ad43268..97ccd15b 100644
--- a/MacPass/MPDocument.h
+++ b/MacPass/MPDocument.h
@@ -57,7 +57,7 @@ APPKIT_EXTERN NSString *const MPDocumnetDidChangeCurrentEntryNotification;
 
 #pragma mark Lock/Decrypt
 - (void)lockDatabase:(id)sender;
-- (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL;
+- (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL error:(NSError *__autoreleasing*)error;
 
 #pragma mark Data Lookup
 /*
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 3401d42b..10114877 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -212,14 +212,13 @@ typedef NS_ENUM(NSUInteger, MPAlertType) {
 
 #pragma mark Lock/Unlock/Decrypt
 
-- (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL {
+- (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL error:(NSError *__autoreleasing*)error{
   KPKPassword *passwordData = [[KPKPassword alloc] initWithPassword:password key:keyFileURL];
   
   self.key = keyFileURL;
   self.password = [password length] > 0 ? password : nil;
   
-  NSError *error;
-  self.tree = [[KPKTree alloc] initWithData:_encryptedData password:passwordData error:&error];
+  self.tree = [[KPKTree alloc] initWithData:_encryptedData password:passwordData error:error];
 
   return (self.tree != nil);
 }