diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java b/Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java
index a662b410e6..590b0f40a0 100755
--- a/Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java
+++ b/Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java
@@ -217,7 +217,7 @@ abstract class AbstractWaypointFetcher implements WaypointBuilder.WaypointFilter
         for (Track track : tracks) {
             if (mostRecent == null) {
                 mostRecent = track.getStartTime();
-            } else {
+            } else if (track.getStartTime() != null) {
                 mostRecent = Math.max(mostRecent, track.getStartTime());
             }
         }