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){