diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m
index 902528e2a..5b9b534e0 100644
--- a/SignalServiceKit/src/Storage/OWSStorage.m
+++ b/SignalServiceKit/src/Storage/OWSStorage.m
@@ -454,8 +454,10 @@ typedef NSData *_Nullable (^CreateDatabaseMetadataBlock)(void);
 - (YapDatabaseConnection *)newDatabaseConnection
 {
     YapDatabaseConnection *dbConnection = self.database.newConnection;
-    OWSRaiseException(
-        @"OWSStorageExceptionName_CouldNotOpenConnection", @"Storage could not open new database connection.");
+    if (!dbConnection) {
+        OWSRaiseException(
+            @"OWSStorageExceptionName_CouldNotOpenConnection", @"Storage could not open new database connection.");
+    }
     return dbConnection;
 }