diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
index 86d6ea894c..a16afe3823 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
@@ -246,8 +246,8 @@ object AutopilotManager : IOchAutopilotStatusListener {
                         true,
                         TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName,
                         TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName,
-                        TaxiPassengerModel.currentOCHOrder!!.orderNo.toInt(),
-                        TaxiPassengerModel.currentLineId.toString(),
+                        TaxiPassengerModel.currentLineId?.toInt()?:0,
+                        TaxiPassengerModel.currentOCHOrder!!.orderNo,
                         System.currentTimeMillis(),
                         "",
                         0