diff --git a/indexedDb/implementation.go b/indexedDb/implementation.go
index 8b9bfa737cdf7a79071b28af52c86e326ea388a0..273a1ec4d54eefcf385d447e34a1d2d12415b13c 100644
--- a/indexedDb/implementation.go
+++ b/indexedDb/implementation.go
@@ -429,6 +429,9 @@ func (w *wasmModel) receiveHelper(newMessage *Message, isUpdate bool) (uint64,
 		return 0, errors.Errorf("Upserting Message failed: %+v", err)
 	}
 	res, err := addReq.Result()
+	if err != nil {
+		return 0, errors.Errorf("Getting result from request failed: %+v", err)
+	}
 
 	// NOTE: Sometimes the insert fails to return an error but hits a duplicate
 	//  insert, so this fallthrough returns the UUID entry in that case.
diff --git a/indexedDb/init.go b/indexedDb/init.go
index f3f4503dec9284896ce6f66d2db44209640a46ad..543ae0aee22c79755143fdbc23f03b433ffca324 100644
--- a/indexedDb/init.go
+++ b/indexedDb/init.go
@@ -109,9 +109,6 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
 	}
 
 	// Attempt to ensure the database has been properly initialized
-	if err != nil {
-		return nil, err
-	}
 	openRequest, err = idb.Global().Open(ctx, databaseName, currentVersion,
 		func(db *idb.Database, oldVersion, newVersion uint) error {
 			return nil