diff --git a/Postbox/Database.swift b/Postbox/Database.swift
index dc9660fc2a..8939a7c452 100644
--- a/Postbox/Database.swift
+++ b/Postbox/Database.swift
@@ -97,8 +97,8 @@ public final class Database {
     /// Executes a batch of SQL statements.
     ///
     /// - parameter SQL: A batch of zero or more semicolon-separated SQL statements.
-    public func execute(_ SQL: String) {
-        sqlite3_exec(self.handle, SQL, nil, nil, nil)
+    public func execute(_ SQL: String) -> Bool {
+        return sqlite3_exec(self.handle, SQL, nil, nil, nil) == SQLITE_OK
     }
 }
 
diff --git a/Postbox/SqliteInterface.swift b/Postbox/SqliteInterface.swift
index 8aef02210b..44a0f0e33d 100644
--- a/Postbox/SqliteInterface.swift
+++ b/Postbox/SqliteInterface.swift
@@ -102,6 +102,9 @@ public final class SqliteInterface {
     
     public init?(databasePath: String) {
         if let database = Database(databasePath) {
+            if !database.execute("pragma schema_version") {
+                return nil
+            }
             self.database = database
         } else {
             return nil