diff --git a/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/common/util/TripSegmentListResolver.kt b/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/common/util/TripSegmentListResolver.kt
index fe1aad3e..143de6b8 100644
--- a/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/common/util/TripSegmentListResolver.kt
+++ b/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/common/util/TripSegmentListResolver.kt
@@ -46,7 +46,7 @@ class TripSegmentListResolver(private val resources: Resources) {
     }
 
     fun resolve() {
-        if (!CollectionUtils.isEmpty(tripSegmentList)) {
+        if (tripSegmentList?.isNotEmpty() == true) {
             putDepartureSegment()
             putArrivalSegment()
 
@@ -122,9 +122,9 @@ class TripSegmentListResolver(private val resources: Resources) {
     private fun fillSegmentIdentifiers() {
         segmentIdGenerator.set(0L)
         var newSegmentId: Long
-        for (segment in tripSegmentList!!) {
+        tripSegmentList?.forEach { segment ->
             newSegmentId = segmentIdGenerator.incrementAndGet()
-            segment!!.segmentId = newSegmentId
+            segment.segmentId = newSegmentId
         }
     }
 
@@ -132,10 +132,10 @@ class TripSegmentListResolver(private val resources: Resources) {
      * Puts a Departure segment before head
      */
     private fun putArrivalSegment() {
-        val lastSegment = tripSegmentList!![tripSegmentList!!.size - 1]
+        val lastSegment = tripSegmentList?.last()
         if (lastSegment != null) {
             val arrivalSegment = createArrivalSegment(lastSegment)
-            tripSegmentList!!.add(arrivalSegment)
+            tripSegmentList?.add(arrivalSegment)
         }
     }
 
@@ -143,10 +143,10 @@ class TripSegmentListResolver(private val resources: Resources) {
      * Puts an Arrival segment after tail
      */
     private fun putDepartureSegment() {
-        val firstSegment = tripSegmentList!![0]
+        val firstSegment = tripSegmentList?.first()
         if (firstSegment != null) {
             val departureSegment = createDepartureSegment(firstSegment)
-            tripSegmentList!!.add(0, departureSegment)
+            tripSegmentList?.add(0, departureSegment)
         }
     }
 }
\ No newline at end of file
diff --git a/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/RoutingResponse.kt b/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/RoutingResponse.kt
index 600a924e..e7875bd1 100644
--- a/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/RoutingResponse.kt
+++ b/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/RoutingResponse.kt
@@ -128,15 +128,13 @@ class RoutingResponse {
     }
 
     private fun resolveTripGroupList(tripGroupList: ArrayList<TripGroup>?) {
-        for (tripGroup in tripGroupList.orEmpty()) {
-            if (CollectionUtils.isNotEmpty(tripGroup.trips)) {
-                for (trip in tripGroup.trips.orEmpty()) {
-                    mTripSegmentListResolver
-                        ?.setOrigin(trip.from)
-                        ?.setDestination(trip.to)
-                        ?.setTripSegmentList(trip.segmentList.toMutableList())
-                        ?.resolve()
-                }
+        tripGroupList?.forEach { tripGroup ->
+            tripGroup.trips?.forEach { trip ->
+                mTripSegmentListResolver
+                    ?.setOrigin(trip.from)
+                    ?.setDestination(trip.to)
+                    ?.setTripSegmentList(trip.segmentList)
+                    ?.resolve()
             }
         }
     }
diff --git a/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/Trip.kt b/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/Trip.kt
index ec8f9b74..0634b271 100644
--- a/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/Trip.kt
+++ b/CommonCoreLegacy/src/main/java/com/skedgo/tripkit/routing/Trip.kt
@@ -150,7 +150,7 @@ class Trip : ITimeRange {
     var tripId: Long = 0
     @Transient var group: TripGroup? = null
     var isFavourite: Boolean = false
-    var segmentList: List<TripSegment> = arrayListOf()
+    var segmentList: MutableList<TripSegment> = mutableListOf()
         set(segments) {
             field = segments
             field.forEach { it.trip = this }
diff --git a/TripKitAndroid/src/main/java/com/skedgo/tripkit/a2brouting/FailoverA2bRoutingApi.kt b/TripKitAndroid/src/main/java/com/skedgo/tripkit/a2brouting/FailoverA2bRoutingApi.kt
index 010b2cc9..e5757b47 100644
--- a/TripKitAndroid/src/main/java/com/skedgo/tripkit/a2brouting/FailoverA2bRoutingApi.kt
+++ b/TripKitAndroid/src/main/java/com/skedgo/tripkit/a2brouting/FailoverA2bRoutingApi.kt
@@ -3,6 +3,7 @@ package com.skedgo.tripkit.a2brouting
 import android.content.res.Resources
 import com.google.gson.Gson
 import com.skedgo.TripKit
+import com.skedgo.rxtry.printThrowableStackTrace
 import com.skedgo.tripkit.RoutingUserError
 import com.skedgo.tripkit.extensions.buildUrlWithQueryParams
 import com.skedgo.tripkit.routing.RoutingResponse
@@ -71,6 +72,7 @@ class FailoverA2bRoutingApi(
                 groups
             }
             .onErrorResumeNext { error: Throwable ->
+                error.printThrowableStackTrace()
                 if (error is RoutingUserError) Maybe.error(error) else Maybe.empty()
             }
             .toObservable()
diff --git a/route-persistence/src/main/java/com/skedgo/routepersistence/RouteContract.kt b/route-persistence/src/main/java/com/skedgo/routepersistence/RouteContract.kt
index 2b135e7d..873f2753 100644
--- a/route-persistence/src/main/java/com/skedgo/routepersistence/RouteContract.kt
+++ b/route-persistence/src/main/java/com/skedgo/routepersistence/RouteContract.kt
@@ -32,8 +32,10 @@ internal object RouteContract {
     const val COL_TRIP_ID: String = "tripId"
     const val COL_JSON: String = "json"
     const val TABLE_SEGMENTS: String = "segments"
+    const val SELECT_SEGMENTS_ALL: String = "select * from " + TABLE_SEGMENTS
     const val SELECT_SEGMENTS: String = "select * from " + TABLE_SEGMENTS + " where tripId = ?"
     const val TABLE_TRIPS: String = "trips"
+    const val SELECT_TRIPS_ALL: String = "select * from " + TABLE_TRIPS
     const val SELECT_TRIPS: String =
         "select * from " + TABLE_TRIPS + " where " + COL_GROUP_ID + " = ?"
     const val TABLE_TRIP_GROUPS: String = "tripGroups"