diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
index 23c0f60afc..12324b6b90 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java
@@ -208,7 +208,7 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
 
             @Override
             @SuppressWarnings({"BoxedValueEquality", "NumberEquality"})
-            protected CommonFilesMetadata doInBackground() throws TskCoreException, NoCurrentCaseException, SQLException, EamDbException, Exception {
+            protected CommonFilesMetadata doInBackground() throws TskCoreException, NoCurrentCaseException, SQLException, EamDbException {
                 progress = ProgressHandle.createHandle(Bundle.CommonFilesPanel_search_done_searchProgress1());
                 progress.start();
                 progress.switchToIndeterminate();
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java b/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
index d32c77ca13..3960c27eee 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Md5Node.java
@@ -62,6 +62,10 @@ public class Md5Node extends DisplayableItemNode {
         this.setDisplayName(this.md5Hash);
     }
     
+    /**
+     * Callable wrapper to further delay lazy ChildFactory creation
+     * and createNodes() call once lazy loading is functional.
+     */
     private static class Md5ChildCallable implements Callable<Children> {
         private final Md5Metadata key;
         private Md5ChildCallable(Md5Metadata key) {