diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java b/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
index 4af2dce791..5e74490853 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
@@ -741,14 +741,18 @@ public class GeospatialDataGenerator {
     private String getTimeStamp(GeospatialTime curTime,
             GeospatialTime lastRunTime) {
         long tmStampMs = 0;
-        if (curTime.getAreaSourceTime() != lastRunTime.getAreaSourceTime()) {
+        if (lastRunTime != null) {
+            if (curTime.getAreaSourceTime() != lastRunTime.getAreaSourceTime()) {
+                tmStampMs = curTime.getAreaSourceTime();
+            } else if (curTime.getParentSourceTime() != lastRunTime
+                    .getParentSourceTime()) {
+                tmStampMs = curTime.getParentSourceTime();
+            } else if (curTime.getTimeZoneSourceTime() != lastRunTime
+                    .getTimeZoneSourceTime()) {
+                tmStampMs = curTime.getTimeZoneSourceTime();
+            }
+        } else {
             tmStampMs = curTime.getAreaSourceTime();
-        } else if (curTime.getParentSourceTime() != lastRunTime
-                .getParentSourceTime()) {
-            tmStampMs = curTime.getParentSourceTime();
-        } else if (curTime.getTimeZoneSourceTime() != lastRunTime
-                .getTimeZoneSourceTime()) {
-            tmStampMs = curTime.getTimeZoneSourceTime();
         }
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");