From ef11ba2ec66694e6e3a095284ddb30a49b75dc2e Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 1 Jul 2016 20:04:35 +0300
Subject: [PATCH] Fix #2733

---
 OsmAnd/src/net/osmand/plus/OsmandSettings.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 53fffbf386..ba3a2b4719 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1495,7 +1495,11 @@ public class OsmandSettings {
 	public PointDescription getAndClearMapLabelToShow(LatLon l) {
 		String label = settingsAPI.getString(globalPreferences, MAP_LABEL_TO_SHOW, null);
 		settingsAPI.edit(globalPreferences).remove(MAP_LABEL_TO_SHOW).commit();
-		return PointDescription.deserializeFromString(label, l);
+		if (label != null) {
+			return PointDescription.deserializeFromString(label, l);
+		} else {
+			return null;
+		}
 	}
 
 	private Object objectToShow;