diff --git a/src/modb_metadata.c b/src/modb_metadata.c
index 5d0df78..f925f32 100644
--- a/src/modb_metadata.c
+++ b/src/modb_metadata.c
@@ -315,7 +315,7 @@ int64_t modbMetadataCreate(stored_conn *sconn, modb_ref *modb,
   uint64_t qry_ret;
 
   if ((sb = strbld_create()) == 0) {
-    return -1;
+    return 0;
   }
   modbTableName(&table, &table_len, modb, METADATA_TABLE, strlen(METADATA_TABLE));
 
@@ -337,13 +337,13 @@ int64_t modbMetadataCreate(stored_conn *sconn, modb_ref *modb,
 
   modbFreeTableName(&table);
   if (strbld_finalize_or_destroy(&sb, &qry, &qry_len) != 0) {
-    return -1;
+    return 0;
   }
 
   qry_ret = simpleQuery(sconn, qry, qry_len);
   free(qry);
 
-  return (int64_t)qry_ret;
+  return (unsigned int)qry_ret;
 }
 
 int64_t modbMetadataReplace(stored_conn *sconn, modb_ref *modb, unsigned int id,
diff --git a/src/modb_objects.c b/src/modb_objects.c
index 39fc3cf..323c25a 100644
--- a/src/modb_objects.c
+++ b/src/modb_objects.c
@@ -242,7 +242,7 @@ int64_t modbObjectCreate(stored_conn *sconn, modb_ref *modb,
   qry_ret = simpleQuery(sconn, qry, qry_len);
   free(qry);
 
-  return (int64_t)qry_ret;
+  return qry_ret == 0 ? id : 0;
 }
 int64_t modbObjectUpdate(stored_conn *sconn, modb_ref *modb, unsigned int id,
                          const char *data, size_t data_len)