diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java b/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java
index 856c80f458..7f88f1e98d 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java
@@ -23,6 +23,7 @@ public class RouteDirectionInfo {
 		return (int) (distance / averageSpeed);
 	}
 
+	// FIXME How it can be null? (fix by constructor and revert MapInfoLayer)
 	public TurnType turnType;
 	// location when you should action (turn or go ahead)
 	public int routePointOffset;
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 7feb2e22bf..32f5087b97 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -544,7 +544,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 						if (d >= 0 && !showMiniMap) {
 							visible = true;
 							RouteDirectionInfo next = routeLayer.getHelper().getNextRouteDirectionInfo();
-							if (next == null) {
+							if (next == null || next.turnType == null) {
 								if (turnType != null) {
 									turnType = null;
 									invalidate();