diff --git a/src/tripviewer/web/Controllers/TripController.cs b/src/tripviewer/web/Controllers/TripController.cs
index 8db729da..48929def 100644
--- a/src/tripviewer/web/Controllers/TripController.cs
+++ b/src/tripviewer/web/Controllers/TripController.cs
@@ -48,7 +48,7 @@ private List<TripPoint> getRandomTripPoints()
             TripStore t = new TripStore(teamendpoint);
             List<Trip> trips = t.GetItemsAsync().Result;
 
-            if (trips.Count == 0){
+            if (trips == null || trips.Count == 0){
                 return new List<TripPoint>();
             }