diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
index 7f04703625..ca3026abb2 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
@@ -1085,12 +1085,18 @@ public class OrderModel {
         parameters.vehicleType = VEHICLE_TYPE;
         if (parameters.autoPilotLine == null) {
             parameters.autoPilotLine = new AutopilotControlParameters.AutoPilotLine(
-                    busRoutesResult.getLineId(), busRoutesResult.getName(),
-                    busRoutesResult.csvFileUrl, busRoutesResult.csvFileMd5,
-                    busRoutesResult.txtFileUrl, busRoutesResult.txtFileMd5,
-                    busRoutesResult.contrailSaveTime, busRoutesResult.carModel,
-                    busRoutesResult.csvFileUrlDPQP, busRoutesResult.csvFileMd5DPQP,
-                    busRoutesResult.txtFileUrlDPQP, busRoutesResult.txtFileMd5DPQP,
+                    busRoutesResult.getLineId(),
+                    busRoutesResult.getName(),
+                    busRoutesResult.csvFileUrl==null?"":busRoutesResult.csvFileUrl,
+                    busRoutesResult.csvFileMd5==null?"":busRoutesResult.csvFileMd5,
+                    busRoutesResult.txtFileUrl==null?"":busRoutesResult.txtFileUrl,
+                    busRoutesResult.txtFileMd5==null?"":busRoutesResult.txtFileMd5,
+                    busRoutesResult.contrailSaveTime,
+                    busRoutesResult.carModel,
+                    busRoutesResult.csvFileUrlDPQP,
+                    busRoutesResult.csvFileMd5DPQP,
+                    busRoutesResult.txtFileUrlDPQP,
+                    busRoutesResult.txtFileMd5DPQP,
                     busRoutesResult.contrailSaveTimeDPQP);
         }
 
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusTrajectoryManager.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusTrajectoryManager.java
index 4370689618..39005ec077 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusTrajectoryManager.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/BusTrajectoryManager.java
@@ -129,17 +129,12 @@ public class BusTrajectoryManager {
             } else {
                 mAutoPilotLine.setLineId(routesResult.getLineId());
                 mAutoPilotLine.setLineName(routesResult.getName());
-                mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl);
-                mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5);
-                mAutoPilotLine.setStopUrl(routesResult.txtFileUrl);
-                mAutoPilotLine.setStopMd5(routesResult.txtFileMd5);
+                mAutoPilotLine.setTrajUrl(routesResult.csvFileUrl==null?"":routesResult.csvFileUrl);
+                mAutoPilotLine.setTrajMd5(routesResult.csvFileMd5==null?"":routesResult.csvFileMd5);
+                mAutoPilotLine.setStopUrl(routesResult.txtFileUrl==null?"":routesResult.txtFileUrl);
+                mAutoPilotLine.setStopMd5(routesResult.txtFileMd5==null?"":routesResult.txtFileMd5);
                 mAutoPilotLine.setTimestamp(routesResult.contrailSaveTime);
-                mAutoPilotLine.setVehicleModel(routesResult.carModel);
-                mAutoPilotLine.setTrajUrl_dpqp(routesResult.csvFileUrlDPQP);
-                mAutoPilotLine.setTrajMd5_dpqp(routesResult.csvFileMd5DPQP);
-                mAutoPilotLine.setStopUrl_dpqp(routesResult.txtFileUrlDPQP);
-                mAutoPilotLine.setStopMd5_dpqp(routesResult.txtFileMd5DPQP);
-                mAutoPilotLine.setTimestamp_dpqp(routesResult.contrailSaveTimeDPQP);
+                mAutoPilotLine.setVehicleModel(routesResult.carModel==null?"":routesResult.carModel);
             }
         }
     }