1 files changed, 4 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/utils/UncertainProperty.java b/main/src/cgeo/geocaching/utils/UncertainProperty.java
index f696098..5f86662 100644
--- a/main/src/cgeo/geocaching/utils/UncertainProperty.java
+++ b/main/src/cgeo/geocaching/utils/UncertainProperty.java
@@ -25,9 +25,12 @@ public class UncertainProperty<T> {
     }
 
     public UncertainProperty<T> getMergedProperty(final UncertainProperty<T> other) {
-        if (other == null) {
+        if (null == other || null == other.value) {
             return this;
         }
+        if (null == this.value) {
+            return other;
+        }
         if (other.certaintyLevel > certaintyLevel) {
             return other;
         }