From 2ab208a577ad1b53ab1a4e94031344b246e2f8fb Mon Sep 17 00:00:00 2001
From: vshcherb <victor.shcherb@gmail.com>
Date: Sun, 22 Sep 2013 02:10:15 +0200
Subject: [PATCH] Update Entity.java

---
 OsmAnd-java/src/net/osmand/osm/edit/Entity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd-java/src/net/osmand/osm/edit/Entity.java b/OsmAnd-java/src/net/osmand/osm/edit/Entity.java
index adeae27dd6..e3c68bae9e 100644
--- a/OsmAnd-java/src/net/osmand/osm/edit/Entity.java
+++ b/OsmAnd-java/src/net/osmand/osm/edit/Entity.java
@@ -121,7 +121,10 @@ public abstract class Entity {
 	}
 	
 	public String removeTag(String key){
-		return tags.remove(key);
+		if(tags != null) {
+			return tags.remove(key);
+		}
+		return null;
 	}
 	
 	public void removeTags(String[] keys){