diff --git a/core/src/main/java/org/apache/sqoop/repository/Repository.java b/core/src/main/java/org/apache/sqoop/repository/Repository.java
index 0bedcbb6..92e11d21 100644
--- a/core/src/main/java/org/apache/sqoop/repository/Repository.java
+++ b/core/src/main/java/org/apache/sqoop/repository/Repository.java
@@ -464,6 +464,11 @@ public final void upgradeConnector(MConnector oldConnector, MConnector newConnec
 
         throw new SqoopException(RepositoryError.JDBCREPO_0027, msg);
       }
+    } catch (SqoopException ex) {
+      if(tx != null) {
+        tx.rollback();
+      }
+      throw ex;
     } catch (Exception ex) {
       if(tx != null) {
         tx.rollback();
@@ -558,6 +563,11 @@ public final void upgradeFramework(MFramework framework) {
 
         throw new SqoopException(RepositoryError.JDBCREPO_0027, msg);
       }
+    } catch (SqoopException ex) {
+      if(tx != null) {
+        tx.rollback();
+      }
+      throw ex;
     } catch (Exception ex) {
       if(tx != null) {
         tx.rollback();