1 files changed, 5 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/connector/AbstractConnector.java b/main/src/cgeo/geocaching/connector/AbstractConnector.java
index 4984273..0583aa1 100644
--- a/main/src/cgeo/geocaching/connector/AbstractConnector.java
+++ b/main/src/cgeo/geocaching/connector/AbstractConnector.java
@@ -19,6 +19,7 @@ import cgeo.geocaching.location.Geopoint;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 
 import rx.functions.Action1;
 
@@ -129,7 +130,8 @@ public abstract class AbstractConnector implements IConnector {
     }
 
     @Override
-    public String getGeocodeFromUrl(final String url) {
+    @Nullable
+    public String getGeocodeFromUrl(@NonNull final String url) {
         final String urlPrefix = getCacheUrlPrefix();
         if (StringUtils.isEmpty(urlPrefix) || StringUtils.startsWith(url, urlPrefix)) {
             @NonNull final String geocode = url.substring(urlPrefix.length());
@@ -144,7 +146,7 @@ public abstract class AbstractConnector implements IConnector {
     abstract protected String getCacheUrlPrefix();
 
     @Override
-    @NonNull
+    @Nullable
     public String getLongCacheUrl(final @NonNull Geocache cache) {
         return getCacheUrl(cache);
     }
@@ -201,7 +203,7 @@ public abstract class AbstractConnector implements IConnector {
     }
 
     @Override
-    public String getWaypointGpxId(final String prefix, final String geocode) {
+    public String getWaypointGpxId(final String prefix, @NonNull final String geocode) {
         // Default: just return the prefix
         return prefix;
     }