diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
index 3b9e32c..5eb4a63 100644
--- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
@@ -438,7 +438,8 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
         if (ContextCompat.checkSelfPermission(DirectionsActivity.this,
                 Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
             android.location.Location location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
-            mapView.animateToLocation(location.getLatitude(), location.getLongitude());
+            if (location != null)
+                mapView.animateToLocation(location.getLatitude(), location.getLongitude());
         }
         mapView.getOverlays().add(new Overlay() {
             private Location pinLocation;