diff --git a/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java b/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
index ee208d3c..944b10bc 100644
--- a/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
+++ b/vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java
@@ -107,10 +107,10 @@ public class MapsforgeMapActivity extends MapActivity {
 	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
 
 		if (requestCode == SELECT_MAP_FILE) {
-			if (resultCode != RESULT_OK || intent == null)
-				return;
-			if (intent.getStringExtra(FilePicker.SELECTED_FILE) == null)
+			if (resultCode != RESULT_OK || intent == null || intent.getStringExtra(FilePicker.SELECTED_FILE) == null) {
+				finish();
 				return;
+			}
 
 			MapFileTileSource tileSource = new MapFileTileSource();
 			tileSource.setPreferredLanguage("en");