diff --git a/indexedDb/impl/channels/implementation.go b/indexedDb/impl/channels/implementation.go
index 415aca68d4e0c4e9dd7269a055bd9c3322770922..35bf00323ada8eb8cb7cb9cf5282c7d72c2b9863 100644
--- a/indexedDb/impl/channels/implementation.go
+++ b/indexedDb/impl/channels/implementation.go
@@ -414,8 +414,9 @@ func (w *wasmModel) upsertMessage(msg *Message) (uint64, error) {
 
 	// Store message to database
 	msgIdObj, err := impl.Put(w.db, messageStoreName, messageObj)
-	if err != nil {
-		return 0, errors.Errorf("Unable to put Message: %+v", err)
+	if err != nil || msgIdObj.Equal(js.Undefined()) {
+		return 0, errors.Errorf("Unable to put Message: %+v\n%s",
+			err, newMessageJson)
 	}
 
 	uuid := msgIdObj.Int()
diff --git a/indexedDb/impl/dm/implementation.go b/indexedDb/impl/dm/implementation.go
index 068b8d41450b3484b3fa22e05a4f8378b48c778a..8d13915d834768eb819265da60f6073e3ebd1bda 100644
--- a/indexedDb/impl/dm/implementation.go
+++ b/indexedDb/impl/dm/implementation.go
@@ -317,8 +317,9 @@ func (w *wasmModel) upsertMessage(msg *Message) (uint64, error) {
 
 	// Store message to database
 	msgIdObj, err := impl.Put(w.db, messageStoreName, messageObj)
-	if err != nil {
-		return 0, errors.Errorf("Unable to put Message: %+v", err)
+	if err != nil || msgIdObj.Equal(js.Undefined()) {
+		return 0, errors.Errorf("Unable to put Message: %+v\n%s",
+			err, newMessageJson)
 	}
 
 	uuid := msgIdObj.Int()