diff --git a/src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java b/src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
index 5f6f157a8c2b071d0d49efe6b65604edb9c1babf..3c2b5977957697ead39bd07e08dd2686bd0b7c1e 100644
--- a/src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
+++ b/src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
@@ -87,6 +87,10 @@ public int downloadRegionFromCityGMLs(String wktPolygon, String project, String
 			File outputFile = selectSaveFileWithDialog(project,
 					csvCitygmls.replace(";", "_").replace(".gml", ""), "selected_region");
 
+			if (outputFile == null) {
+				return -1;
+			}
+
 			int count;
 			try (BufferedWriter gmlWriter = Files.newBufferedWriter(outputFile.toPath())) {
 				count = RegionExtractor.selectRegionDirectlyFromCityGML(wktPolygon, srsName, gmlWriter, paths);
diff --git a/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js b/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
index a889bdb0eb614c4c47c0bc1301969aae61fc8c04..163c2479a07a91b378a57aff4d5db54102776f8c 100644
--- a/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
+++ b/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
@@ -244,7 +244,11 @@ var regionChooser = (function(){
 				console.log("Selected region is written in " + srsName + " coordinate system.");
 				try {
 					var count = fxapp.downloadRegionFromCityGMLs(sketchAsWKT(srsName), project, citygmlNames.join(";"), srsName);
-					dataPanel.prepend("<h2 class='ok'>Done! (" + count + " buildings found) </h2><br/>\n");
+					if (count == -1){
+						console.log("No output file has been selected.");
+					} else {
+						dataPanel.prepend("<h2 class='ok'>Done! (" + count + " buildings found) </h2><br/>\n");
+					}
 				} catch (e) {
 					console.warn("ERROR : " + e);
 					dataPanel.prepend("<h2 class='error'>Some problem occured!</h2><br/>\n");