diff --git a/src/SQLite.cs b/src/SQLite.cs
index 72525c56..dd4f5962 100644
--- a/src/SQLite.cs
+++ b/src/SQLite.cs
@@ -3476,25 +3476,27 @@ public int ExecuteNonQuery ()
 				_conn.Tracer?.Invoke ("Executing: " + this);
 			}
 
-			var r = SQLite3.Result.OK;
 			var stmt = Prepare ();
-			r = SQLite3.Step (stmt);
-			Finalize (stmt);
-			if (r == SQLite3.Result.Done) {
-				int rowsAffected = SQLite3.Changes (_conn.Handle);
-				return rowsAffected;
-			}
-			else if (r == SQLite3.Result.Error) {
-				string msg = SQLite3.GetErrmsg (_conn.Handle);
-				throw SQLiteException.New (r, msg);
-			}
-			else if (r == SQLite3.Result.Constraint) {
-				if (SQLite3.ExtendedErrCode (_conn.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
+			try {
+				var r = SQLite3.Step (stmt);
+				if (r == SQLite3.Result.Done) {
+					int rowsAffected = SQLite3.Changes (_conn.Handle);
+					return rowsAffected;
+				}
+				else if (r == SQLite3.Result.Error) {
+					string msg = SQLite3.GetErrmsg (_conn.Handle);
+					throw SQLiteException.New (r, msg);
+				}
+				else if (r == SQLite3.Result.Constraint && SQLite3.ExtendedErrCode (_conn.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
 					throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (_conn.Handle));
 				}
+				else {
+					throw SQLiteException.New (r, SQLite3.GetErrmsg (_conn.Handle));
+				}
+			}
+			finally {
+				Finalize (stmt);
 			}
-
-			throw SQLiteException.New (r, SQLite3.GetErrmsg (_conn.Handle));
 		}
 
 		public IEnumerable<T> ExecuteDeferredQuery<
@@ -4193,8 +4195,6 @@ public int ExecuteNonQuery (object[] source)
 				Connection.Tracer?.Invoke ("Executing: " + CommandText);
 			}
 
-			var r = SQLite3.Result.OK;
-
 			if (!Initialized) {
 				Statement = SQLite3.Prepare2 (Connection.Handle, CommandText);
 				Initialized = true;
@@ -4206,25 +4206,26 @@ public int ExecuteNonQuery (object[] source)
 					SQLiteCommand.BindParameter (Statement, i + 1, source[i], Connection.StoreDateTimeAsTicks, Connection.DateTimeStringFormat, Connection.StoreTimeSpanAsTicks);
 				}
 			}
-			r = SQLite3.Step (Statement);
 
-			if (r == SQLite3.Result.Done) {
-				int rowsAffected = SQLite3.Changes (Connection.Handle);
-				SQLite3.Reset (Statement);
-				return rowsAffected;
-			}
-			else if (r == SQLite3.Result.Error) {
-				string msg = SQLite3.GetErrmsg (Connection.Handle);
-				SQLite3.Reset (Statement);
-				throw SQLiteException.New (r, msg);
-			}
-			else if (r == SQLite3.Result.Constraint && SQLite3.ExtendedErrCode (Connection.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
-				SQLite3.Reset (Statement);
-				throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (Connection.Handle));
+			try {
+				var r = SQLite3.Step (Statement);
+				if (r == SQLite3.Result.Done) {
+					int rowsAffected = SQLite3.Changes (Connection.Handle);
+					return rowsAffected;
+				}
+				else if (r == SQLite3.Result.Error) {
+					string msg = SQLite3.GetErrmsg (Connection.Handle);
+					throw SQLiteException.New (r, msg);
+				}
+				else if (r == SQLite3.Result.Constraint && SQLite3.ExtendedErrCode (Connection.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
+					throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (Connection.Handle));
+				}
+				else {
+					throw SQLiteException.New (r, SQLite3.GetErrmsg (Connection.Handle));
+				}
 			}
-			else {
+			finally {
 				SQLite3.Reset (Statement);
-				throw SQLiteException.New (r, SQLite3.GetErrmsg (Connection.Handle));
 			}
 		}