Fix #1736: some caches can be null

Due to the fragile concurrent updates, some caches can be null. Check
against it, and do the same thing for waypoints.

1 files changed, 2 insertions, 2 deletions

diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index f6a5a8b..8b5fe18 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -1209,7 +1209,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
                     if (cachesToDisplay.size() == 1 || (cachesCnt < Settings.getWayPointsThreshold())) {
                         for (cgWaypoint waypoint : waypointsToDisplay) {
 
-                            if (waypoint.getCoords() == null) {
+                            if (waypoint == null || waypoint.getCoords() == null) {
                                 continue;
                             }
 
@@ -1218,7 +1218,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto
                     }
                     for (cgCache cache : cachesToDisplay) {
 
-                        if (cache.getCoords() == null) {
+                        if (cache == null || cache.getCoords() == null) {
                             continue;
                         }
                         itemsToDisplay.add(getItem(cache, cache, null));