diff --git a/OsmAnd/src/net/osmand/plus/NavigationService.java b/OsmAnd/src/net/osmand/plus/NavigationService.java
index 16f1afddcc..cb7d249d10 100644
--- a/OsmAnd/src/net/osmand/plus/NavigationService.java
+++ b/OsmAnd/src/net/osmand/plus/NavigationService.java
@@ -4,16 +4,13 @@ import android.app.Notification;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.location.LocationManager;
 import android.os.Binder;
 import android.os.IBinder;
-import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 
 import net.osmand.Location;
-import net.osmand.PlatformUtil;
 import net.osmand.plus.helpers.LocationServiceHelper;
 import net.osmand.plus.helpers.LocationServiceHelper.LocationCallback;
 import net.osmand.plus.notifications.OsmandNotification;
@@ -95,12 +92,6 @@ public class NavigationService extends Service {
 
 				@Override
 				public void onLocationAvailability(boolean locationAvailable) {
-					if (!locationAvailable) {
-						OsmandApplication app = (OsmandApplication) getApplication();
-						if (app != null) {
-							app.showToastMessage(getString(R.string.off_router_service_no_gps_available));
-						}
-					}
 				}
 			});
 		} catch (SecurityException e) {
@@ -137,10 +128,12 @@ public class NavigationService extends Service {
 		app.setNavigationService(null);
 		usedBy = 0;
 		// remove updates
-		try {
-			locationServiceHelper.removeLocationUpdates();
-		} catch (SecurityException e) {
-			// Location service permission not granted
+		if (locationServiceHelper != null) {
+			try {
+				locationServiceHelper.removeLocationUpdates();
+			} catch (SecurityException e) {
+				// Location service permission not granted
+			}
 		}
 		// remove notification
 		stopForeground(Boolean.TRUE);
diff --git a/OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java
index 80fd5381ab..fd9caafe2c 100644
--- a/OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java
+++ b/OsmAnd/src/net/osmand/plus/voice/JSMediaCommandPlayerImpl.java
@@ -90,9 +90,12 @@ public class JSMediaCommandPlayerImpl extends MediaCommandPlayerImpl {
         if (voiceDir.getName().contains("tts")) {
             return false;
         }
-        for (File f : voiceDir.listFiles()) {
-            if (f.getName().endsWith(IndexConstants.TTSVOICE_INDEX_EXT_JS)) {
-                return true;
+        File[] files = voiceDir.listFiles();
+        if (files != null) {
+            for (File f : files) {
+                if (f.getName().endsWith(IndexConstants.TTSVOICE_INDEX_EXT_JS)) {
+                    return true;
+                }
             }
         }
         return false;