diff --git a/tools/autotools/tsk_loaddb.cpp b/tools/autotools/tsk_loaddb.cpp
index ca1e5987f6ad622832e937672b40175585c09133..b31ebf103f092b99a6aed071be27b2067452c077 100644
--- a/tools/autotools/tsk_loaddb.cpp
+++ b/tools/autotools/tsk_loaddb.cpp
@@ -163,7 +163,6 @@ main(int argc, char **argv1)
 
     if (autoDb->startAddImage(argc - OPTIND, &argv[OPTIND], imgtype, ssize)) {
         tsk_error_print(stderr);
-        autoDb->revertAddImage();
         exit(1);
     }
 
diff --git a/tsk3/auto/auto_db.cpp b/tsk3/auto/auto_db.cpp
index 528bb192cf78a6f24cc83b468c0cf01478927024..ee703f3ff8855940bc0b89672aa1d61894fd5a10 100644
--- a/tsk3/auto/auto_db.cpp
+++ b/tsk3/auto/auto_db.cpp
@@ -288,7 +288,7 @@ TSK_RETVAL_ENUM
 
 /**
  * Start the process to add image/file metadata to database. Reverts
- * all changes on error or TSK_STOP flag. When runProcess()
+ * all changes on error. When runProcess()
  * returns, user must call either commitAddImage() to commit the changes,
  * or revertAddImage() to revert them.
  * @returns 1 on error and 0 on success
diff --git a/tsk3/auto/db_sqlite.cpp b/tsk3/auto/db_sqlite.cpp
index 73a7bfb8392ae511b7f93376f859068090c805ed..71a1f6031861dc5eccea60571bbcbfbf89d76026 100644
--- a/tsk3/auto/db_sqlite.cpp
+++ b/tsk3/auto/db_sqlite.cpp
@@ -495,6 +495,8 @@ int
             || attempt(sqlite3_step(m_selectFilePreparedStmt), SQLITE_ROW,
                 "Error selecting file id by meta_addr: %s (result code %d)\n"))
         {
+            // Statement may be used again, even after error
+            sqlite3_reset(m_selectFilePreparedStmt);
             return 1;
         }