diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index a5648a2910..db7f4e8b33 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -119,7 +119,7 @@ public class MapContextMenu {
 					Amenity a = (Amenity) object;
 					if (a.getSubType() != null && a.getType() != null) {
 						PoiType pt = a.getType().getPoiTypeByKeyName(a.getSubType());
-						if (pt != null && pt.getOsmTag().equals("place")) {
+						if (pt != null && pt.getOsmTag() != null && pt.getOsmTag().equals("place")) {
 							res = false;
 						}
 					}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
index 8bf9da2282..0d51ad72a5 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
@@ -6,9 +6,7 @@ import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.widget.Toast;
 
-import net.osmand.access.AccessibleToast;
 import net.osmand.data.FavouritePoint;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.OsmandApplication;
@@ -16,8 +14,6 @@ import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.FavoriteImageDrawable;
 
-import java.text.MessageFormat;
-
 public class FavoritePointEditorFragment extends PointEditorFragment {
 
 	private FavoritePointEditor editor;