diff --git a/src/main/java/org/sdnplatform/sync/internal/store/JavaDBStorageEngine.java b/src/main/java/org/sdnplatform/sync/internal/store/JavaDBStorageEngine.java
index c29b88ddaed94520cdc4bcda54db897726746d8a..2f519551fcbb8d6dd663caf1988b7b9b9472979f 100644
--- a/src/main/java/org/sdnplatform/sync/internal/store/JavaDBStorageEngine.java
+++ b/src/main/java/org/sdnplatform/sync/internal/store/JavaDBStorageEngine.java
@@ -197,10 +197,12 @@ public class JavaDBStorageEngine implements IStorageEngine<ByteArray, byte[]> {
                 update.execute();
                 dbConnection.commit();
             } catch (SyncException e) {
-                dbConnection.rollback();
+            	if(dbConnection != null)
+            		dbConnection.rollback();
                 throw e;
             } catch (Exception e) {
-                dbConnection.rollback();
+            	if(dbConnection != null)
+            		dbConnection.rollback();
                 throw new PersistException("Could not retrieve key from database",
                                            e);
             } finally {