diff --git a/database.c b/database.c
index 25fdead8..f61c4a60 100644
--- a/database.c
+++ b/database.c
@@ -36,7 +36,12 @@ void check_database(int rc)
 
 void dbclose(void)
 {
-	sqlite3_close(db);
+	int rc = sqlite3_close(db);
+	// Report any error
+	if( rc )
+		logg("dbclose() - SQL error (%i): %s", rc, sqlite3_errmsg(db));
+
+	// Unlock mutex on the database
 	pthread_mutex_unlock(&dblock);
 }
 
@@ -392,9 +397,9 @@ void save_to_DB(void)
 	}
 
 	// Finish prepared statement
-	ret = dbquery("END TRANSACTION");
-	if(!ret){ dbclose(); return; }
-	sqlite3_finalize(stmt);
+	dbquery("END TRANSACTION");
+	ret = sqlite3_finalize(stmt);
+	if(ret != SQLITE_OK){ dbclose(); return; }
 
 	// Store index for next loop interation round and update last time stamp
 	// in the database only if all queries have been saved successfully