diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/TextContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/TextContentViewer.java
index d7f853caab..426163ef80 100644
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/TextContentViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/textcontentviewer/TextContentViewer.java
@@ -24,6 +24,7 @@ import org.openide.util.NbBundle.Messages;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
 import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.BlackboardArtifact;
 
 /**
  * A DataContentViewer that displays text with the TextViewers available.
@@ -91,14 +92,10 @@ public class TextContentViewer implements DataContentViewer {
         if (node == null) {
             return false;
         }
+
         // get the node's File, if it has one
         AbstractFile file = node.getLookup().lookup(AbstractFile.class);
-        if (file == null) {
-            return false;
-        }
-        
-        // disable the text content viewer for directories and empty files
-        if (file.isDir() || file.getSize() == 0) {
+        if (file != null && (file.isDir() || file.getSize() == 0)) {
             return false;
         }