diff --git a/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerServiceImpl.java b/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerServiceImpl.java
index 4e3ae680ab..141c8cc840 100644
--- a/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerServiceImpl.java
+++ b/gtas-parent/gtas-commons/src/main/java/gov/gtas/services/PassengerServiceImpl.java
@@ -161,8 +161,10 @@ public PassengersPageDto getPassengersByCriteria(Long flightId, PassengersReques
                     }
                 }
             }
-            if (p.getPassengerWLTimestamp() != null && p.getPassengerWLTimestamp().getHitCount() > 0) {
-                vo.setOnWatchListLink(true);
+            if (p.getPassengerWLTimestamp() != null
+                    && p.getPassengerWLTimestamp().getHitCount() != null
+                    && p.getPassengerWLTimestamp().getHitCount() > 0) {
+                    vo.setOnWatchListLink(true);
             }
 
             // grab flight info