diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
index 02ec421a12..5255af44ce 100644
--- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
+++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -1025,13 +1025,16 @@ protected OutgoingBatch extractOutgoingBatch(ProcessInfo extractInfo, Node targe
                         resource.delete();
                     }
                     throw ex;
-                } finally {                    
-                    IStagedResource resource = getStagedResource(currentBatch);
-                    if (resource != null) {
-                        resource.setState(State.DONE);
+                } finally { 
+                    try {                        
+                        IStagedResource resource = getStagedResource(currentBatch);
+                        if (resource != null) {
+                            resource.setState(State.DONE);
+                        }
+                    } finally {                        
+                        releaseLock(lock, currentBatch, useStagingDataWriter);
+                        log.debug("{} released lock for batch {}", targetNode.getNodeId(), currentBatch.getBatchId());
                     }
-                    releaseLock(lock, currentBatch, useStagingDataWriter);
-                    log.debug("{} released lock for batch {}", targetNode.getNodeId(), currentBatch.getBatchId());
                 }
             }
 
diff --git a/symmetric-core/src/main/resources/symmetric-default.properties b/symmetric-core/src/main/resources/symmetric-default.properties
index d16fa60ff7..27f84ca157 100644
--- a/symmetric-core/src/main/resources/symmetric-default.properties
+++ b/symmetric-core/src/main/resources/symmetric-default.properties
@@ -233,7 +233,6 @@ https.verified.server.names=
 # in the batch tables will be more accurate if this is set to true because each timed
 # operation is independent of the others.
 #
-# DatabaseOverridable: true
 # Tags: transport
 # Type: boolean
 stream.to.file.enabled=true