diff --git a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java
index 67ec1ecd00..c3550051cf 100644
--- a/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java
+++ b/Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java
@@ -203,6 +203,7 @@ class AddImageWizardPanel3 implements WizardDescriptor.Panel<WizardDescriptor> {
             // task
             AddImageAction.CleanupTask cleanupImage = (AddImageAction.CleanupTask) settings.getProperty(AddImageAction.IMAGECLEANUPTASK_PROP);
             cleanupImage.disable();
+            settings.putProperty(AddImageAction.IMAGECLEANUPTASK_PROP, null);
         }
     }
 }
diff --git a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java b/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java
index 6316e30a69..dfa562ed87 100644
--- a/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java
+++ b/FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java
@@ -167,8 +167,10 @@ public final class FileSearchTopComponent extends TopComponent implements DataEx
                     SleuthkitCase tempDb = currentCase.getSleuthkitCase();
                     ResultSet rs = tempDb.runQuery(this.getQuery("count(*) as TotalMatches"));
                     totalMatches = totalMatches + rs.getInt("TotalMatches");
+                    rs.close();
                     rs = tempDb.runQuery(this.getQuery(null));
                     currentDbList = tempDb.resultSetToFsContents(rs);
+                    rs.close();
                     fsContentList.addAll(currentDbList);
                 } catch (SQLException ex) {
                     Logger logger = Logger.getLogger(this.getClass().getName());