diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
index 483b7bdf6be967b663c457047fc6e75a340d41e2..ad3e03c8cea3ad87fac8ead4a63d7dfdad53964d 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
@@ -353,6 +353,9 @@ public MarkupSource getSelectedSource() {
     }
 
     private void setPanelText(String text) {
+        if (text == null ) {
+            text = "";
+        }
         extractedTextPane.setText(text);
         extractedTextPane.setCaretPosition(0);
     }
@@ -593,7 +596,7 @@ protected Object doInBackground() throws Exception {
 
         @Override
         protected void done() {
-            super.done();
+            //super.done();
             progress.finish();
             if (markup != null) {
                 setPanelText(markup);