2 files changed, 6 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
index 801abe4..c5ef40c 100644
--- a/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
+++ b/main/src/cgeo/geocaching/maps/mapsforge/MapsforgeMapProvider.java
@@ -50,9 +50,12 @@ public final class MapsforgeMapProvider extends AbstractMapProvider {
     }
 
     public static List<String> getOfflineMaps() {
+        final String directoryPath = Settings.getMapFileDirectory();
+        if (StringUtils.isBlank(directoryPath)) {
+            return Collections.emptyList();
+        }
 
-        File directory = new File(Settings.getMapFileDirectory());
-
+        File directory = new File(directoryPath);
         if (directory.isDirectory()) {
             try {
                 ArrayList<String> mapFileList = new ArrayList<String>();
diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index 629debd..d798a82 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -432,8 +432,7 @@ public class SettingsActivity extends PreferenceActivity {
                     }
                 }
                 initMapSourcePreference();
-                getPreference(R.string.pref_mapDirectory).setSummary(
-                        Settings.getMapFileDirectory());
+                getPreference(R.string.pref_mapDirectory).setSummary(StringUtils.defaultString(Settings.getMapFileDirectory()));
                 break;
             case R.string.pref_fakekey_ocde_authorization:
                 setOCDEAuthTitle();