diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
index 5fc94ec938..aa78e1a931 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt
@@ -27,7 +27,9 @@ class TrafficLightHMIManager {
             initView = true
             CallerHmiManager.showWarningTrafficLight(0)
         }
-        callerHMIToChangeLight(currentTrafficLight)
+        currentTrafficLight?.let {
+            callerHMIToChangeLight(it)
+        }
     }
 
     private fun callerHMIToChangeLight(trafficLightStatus: TrafficLightStatus) {
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightResult.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightResult.kt
index 5ce9b12983..5bfcea69e1 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightResult.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightResult.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.data.trafficlight
 
-fun TrafficLightResult.currentRoadTrafficLight(): TrafficLightStatus {
+fun TrafficLightResult.currentRoadTrafficLight(): TrafficLightStatus? {
     return TrafficLightStatusHelper.getCurrentRoadTrafficLight(this)
 }