diff --git a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/SingleEvent.java b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/SingleEvent.java
index d336a66441..26d9126fe0 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/datamodel/SingleEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/datamodel/SingleEvent.java
@@ -61,7 +61,7 @@ public class SingleEvent implements TimeLineEvent {
     public SingleEvent(long eventID, long dataSourceID, long objID, @Nullable Long artifactID, long time, EventType type, String fullDescription, String medDescription, String shortDescription, TskData.FileKnown known, boolean hashHit, boolean tagged) {
         this.eventID = eventID;
         this.fileID = objID;
-        this.artifactID = (artifactID == null || artifactID == 0) ? null : artifactID;
+        this.artifactID = Long.valueOf(0).equals(artifactID) ? null : artifactID;
         this.time = time;
         this.subType = type;
         descriptions = ImmutableMap.<DescriptionLoD, String>of(DescriptionLoD.FULL, fullDescription,
@@ -88,9 +88,8 @@ public class SingleEvent implements TimeLineEvent {
         return hashHit;
     }
 
-    @Nullable
-    public Long getArtifactID() {
-        return artifactID;
+    public Optional<Long> getArtifactID() {
+        return Optional.ofNullable(artifactID);
     }
 
     public long getEventID() {
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventRootNode.java b/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventRootNode.java
index e84c49922f..686dfea1c7 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventRootNode.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/explorernodes/EventRootNode.java
@@ -33,9 +33,9 @@ import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor;
 import org.sleuthkit.autopsy.timeline.datamodel.FilteredEventsModel;
 import org.sleuthkit.autopsy.timeline.datamodel.SingleEvent;
-import org.sleuthkit.autopsy.timeline.datamodel.eventtype.BaseTypes;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
+import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
@@ -79,7 +79,6 @@ public class EventRootNode extends DisplayableItemNode {
 //    public String getItemType() {
 //        return "EventRoot";
 //    }
-
     /**
      * The node factories used to make lists of files to send to the result
      * viewer using the lazy loading (rather than background) loading option to
@@ -113,22 +112,22 @@ public class EventRootNode extends DisplayableItemNode {
             if (eventID >= 0) {
                 final SingleEvent eventById = filteredEvents.getEventById(eventID);
                 try {
-                    AbstractFile file = Case.getCurrentCase().getSleuthkitCase().getAbstractFileById(eventById.getFileID());
+                    SleuthkitCase sleuthkitCase = Case.getCurrentCase().getSleuthkitCase();
+                    AbstractFile file = sleuthkitCase.getAbstractFileById(eventById.getFileID());
                     if (file != null) {
-                        if (eventById.getEventType().getSuperType() == BaseTypes.FILE_SYSTEM) {
-                            return new EventNode(eventById, file);
-                        } else {
-                            BlackboardArtifact blackboardArtifact = Case.getCurrentCase().getSleuthkitCase().getBlackboardArtifact(eventById.getArtifactID());
-
+                        if (eventById.getArtifactID().isPresent()) {
+                            BlackboardArtifact blackboardArtifact = sleuthkitCase.getBlackboardArtifact(eventById.getArtifactID().get());
                             return new EventNode(eventById, file, blackboardArtifact);
+                        } else {
+                            return new EventNode(eventById, file);
                         }
                     } else {
                         LOGGER.log(Level.WARNING, "Failed to lookup sleuthkit object backing TimeLineEvent."); // NON-NLS
                         return null;
                     }
 
-                } catch (TskCoreException tskCoreException) {
-                    LOGGER.log(Level.WARNING, "Failed to lookup sleuthkit object backing TimeLineEvent.", tskCoreException); // NON-NLS
+                } catch (IllegalStateException | TskCoreException ex) {
+                    LOGGER.log(Level.WARNING, "Failed to lookup sleuthkit object backing TimeLineEvent.", ex); // NON-NLS
                     return null;
                 }
             } else {