diff --git a/src/java/simpledb/Parser.java b/src/java/simpledb/Parser.java
index 8608fd68..b879595b 100644
--- a/src/java/simpledb/Parser.java
+++ b/src/java/simpledb/Parser.java
@@ -432,20 +432,20 @@ public void handleTransactStatement(ZTransactStmt s)
                     throw new ParsingException(
                             "No transaction is currently running");
                 curtrans.commit();
-                curtrans = null;
                 inUserTrans = false;
                 System.out.println("Transaction " + curtrans.getId().getId()
                         + " committed.");
+                curtrans = null;
                 break;
             case "ROLLBACK":
                 if (curtrans == null)
                     throw new ParsingException(
                             "No transaction is currently running");
                 curtrans.abort();
-                curtrans = null;
                 inUserTrans = false;
                 System.out.println("Transaction " + curtrans.getId().getId()
                         + " aborted.");
+                curtrans = null;
 
                 break;
             case "SET TRANSACTION":