diff --git a/External/Pearl b/External/Pearl
index 2a158bc7..396fe5bd 160000
--- a/External/Pearl
+++ b/External/Pearl
@@ -1 +1 @@
-Subproject commit 2a158bc768e719a6d2f11eaf9426ae7ed8b83d9c
+Subproject commit 396fe5bd8a53adad376231ff32c56984f94c9c96
diff --git a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme
index 5584e0ce..33ed0f7c 100644
--- a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme	
+++ b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme	
@@ -7,7 +7,7 @@
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "NO"
+            buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "YES"
diff --git a/MasterPassword/MPEntities.m b/MasterPassword/MPEntities.m
index 796bf704..3ccc21da 100644
--- a/MasterPassword/MPEntities.m
+++ b/MasterPassword/MPEntities.m
@@ -103,6 +103,10 @@
 }
 
 - (id)content {
+    
+    NSData *key = [MPAppDelegate get].key;
+    if (!key)
+        return nil;
 
     if (!(self.type & MPElementTypeClassGenerated)) {
         err(@"Corrupt element: %@, type: %d is not in MPElementTypeClassGenerated", self.name, self.type);
@@ -112,7 +116,7 @@
     if (![self.name length])
         return nil;
 
-    return MPCalculateContent(self.type, self.name, [MPAppDelegate get].key, self.counter);
+    return MPCalculateContent(self.type, self.name, key, self.counter);
 }
 
 @end
@@ -131,12 +135,20 @@
 
 - (id)content {
     
-    return [self contentUsingKey:[MPAppDelegate get].key];
+    NSData *key = [MPAppDelegate get].key;
+    if (!key)
+        return nil;
+
+    return [self contentUsingKey:key];
 }
 
 - (void)setContent:(id)content {
     
-    [self setContent:content usingKey:[MPAppDelegate get].key];
+    NSData *key = [MPAppDelegate get].key;
+    if (!key)
+        return;
+    
+    [self setContent:content usingKey:key];
 }
 
 - (id)contentUsingKey:(NSData *)key {