diff --git a/safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java
index 0daa7c7..9339926 100644
--- a/safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/LiveActivity.java
@@ -444,12 +444,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
 
     public void displayVehicle(double latZoom, double lngZoom) {
         if (googleMap != null) {
-            String openWindow = "";
-            for (Marker marker : markers) {
-                if (marker.isInfoWindowShown()) {
-                    openWindow = marker.getTitle();
-                }
-            }
             googleMap.clear();
 
             for (int i = 0; i < displayedVehicles.size(); i++) {
@@ -464,7 +458,8 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
                         markerOptions.icon(markerIcon);
 
                         Marker marker = this.googleMap.addMarker(markerOptions);
-                        if (openWindow.equals(marker.getTitle()) || i == lastItemClicked) {
+
+                        if (i == lastItemClicked) {
                             marker.showInfoWindow();
                             googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newLocation, 14));
                         }
@@ -474,7 +469,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
                 }
             }
         }
-        lastItemClicked = 0;
     }
 
     private BitmapDescriptor getProperBitmap(int largeIcon, String text) {
diff --git a/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java b/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
index 6686bee..4b1d493 100644
--- a/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
@@ -700,7 +700,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
 			tcpTimer = null;
 		}
 
-		if (getRadioActivity().audioThread != null) {
+		if (getRadioActivity() != null && getRadioActivity().audioThread != null) {
 			Thread moribund = getRadioActivity().audioThread;
 			getRadioActivity().audioThread = null;
 			moribund.interrupt();