diff --git a/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java
index 4542915cf9..9719eb36b4 100644
--- a/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java
+++ b/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java
@@ -81,7 +81,6 @@ public class RouteDataObject {
 						return names.get(k);
 					}
 				}
- 				
 			}
 			return names.get(region.nameTypeRule);
 		}
diff --git a/OsmAnd/res/xml/navigation_settings.xml b/OsmAnd/res/xml/navigation_settings.xml
index 8330ea05ff..d81ec10f0a 100644
--- a/OsmAnd/res/xml/navigation_settings.xml
+++ b/OsmAnd/res/xml/navigation_settings.xml
@@ -40,9 +40,11 @@
                     android:title="@string/wake_on_voice"
                     android:summary="@string/wake_on_voice_descr" />
             
+            <!-- 
             <ListPreference
                     android:key="delay_to_start_navigation"
                     android:title="@string/delay_to_start_navigation"
                     android:summary="@string/delay_to_start_navigation_descr" />
+				-->
         </PreferenceCategory>
 </PreferenceScreen>
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
index e7497756ad..9ac7dbc08d 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
@@ -323,6 +323,8 @@ public class EditPoiDialogFragment extends DialogFragment {
 			}
 		} else if(editPoiData.getPoiCategory() == getMyApplication().getPoiTypes().getOtherPoiCategory()) {
 			poiTypeEditText.setError(getResources().getString(R.string.please_specify_poi_type));
+		} else if(editPoiData.getPoiTypeDefined() == null) {
+			poiTypeEditText.setError(getResources().getString(R.string.please_specify_poi_type_only_from_list));
 		} else {
 			save();
 		}