diff --git a/android/src/com/mapswithme/maps/Ads/AdsManager.java b/android/src/com/mapswithme/maps/Ads/AdsManager.java
index e7c76a4784..3994902701 100644
--- a/android/src/com/mapswithme/maps/Ads/AdsManager.java
+++ b/android/src/com/mapswithme/maps/Ads/AdsManager.java
@@ -73,6 +73,9 @@ public class AdsManager
 
   private static void cacheMenuAds(String menuAdsString)
   {
+    if (menuAdsString == null)
+      return;
+
     final File cacheFile = new File(MWMApplication.get().getDataStoragePath(), CACHE_FILE);
     try (FileOutputStream fileOutputStream = new FileOutputStream(cacheFile))
     {
diff --git a/android/src/com/mapswithme/maps/location/LocationService.java b/android/src/com/mapswithme/maps/location/LocationService.java
index 6526142978..291b953c3a 100644
--- a/android/src/com/mapswithme/maps/location/LocationService.java
+++ b/android/src/com/mapswithme/maps/location/LocationService.java
@@ -556,7 +556,7 @@ public class LocationService implements
     @Override
     protected Location getLastGpsLocation()
     {
-      return mLocationClient.getLastLocation();
+      return (mLocationClient != null ? mLocationClient.getLastLocation() : null);
     }
 
     private void refreshUpdates()
diff --git a/android/src/com/mapswithme/maps/settings/StoragePathManager.java b/android/src/com/mapswithme/maps/settings/StoragePathManager.java
index 42ec28d509..682b1b92a1 100644
--- a/android/src/com/mapswithme/maps/settings/StoragePathManager.java
+++ b/android/src/com/mapswithme/maps/settings/StoragePathManager.java
@@ -399,6 +399,10 @@ public class StoragePathManager
 
   private static boolean doMoveMaps(StoragePathAdapter.StorageItem newStorage, StoragePathAdapter.StorageItem oldStorage)
   {
+    // According to onStorageItemClick code above, oldStorage can be null.
+    if (oldStorage == null)
+      return false;
+
     String fullOldPath = getItemFullPath(oldStorage);
     String fullNewPath = getItemFullPath(newStorage);
     File oldDir = new File(fullOldPath);