1 files changed, 3 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/ui/Formatter.java b/main/src/cgeo/geocaching/ui/Formatter.java
index e006d57..ea2ecb5 100644
--- a/main/src/cgeo/geocaching/ui/Formatter.java
+++ b/main/src/cgeo/geocaching/ui/Formatter.java
@@ -153,8 +153,9 @@ public abstract class Formatter {
 
     public static String formatWaypointInfo(cgWaypoint waypoint) {
         final List<String> infos = new ArrayList<String>(3);
-        if (WaypointType.ALL_TYPES_EXCEPT_OWN_AND_ORIGINAL.contains(waypoint.getWaypointType())) {
-            infos.add(waypoint.getWaypointType().getL10n());
+        WaypointType waypointType = waypoint.getWaypointType();
+        if (waypointType != WaypointType.OWN && waypointType != null) {
+            infos.add(waypointType.getL10n());
         }
         if (cgWaypoint.PREFIX_OWN.equalsIgnoreCase(waypoint.getPrefix())) {
             infos.add(cgeoapplication.getInstance().getString(R.string.waypoint_custom));