1 files changed, 6 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/connector/opencaching/OpenCachingConnector.java b/main/src/cgeo/geocaching/connector/opencaching/OpenCachingConnector.java
index 7c13c5b..bfaa345 100644
--- a/main/src/cgeo/geocaching/connector/opencaching/OpenCachingConnector.java
+++ b/main/src/cgeo/geocaching/connector/opencaching/OpenCachingConnector.java
@@ -3,26 +3,27 @@ package cgeo.geocaching.connector.opencaching;
 import cgeo.geocaching.cgCache;
 import cgeo.geocaching.connector.AbstractConnector;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.util.regex.Pattern;
 
 public class OpenCachingConnector extends AbstractConnector {
 
     private final String host;
     private final String name;
-    private final String prefix;
+    private final Pattern codePattern;
     private static final Pattern gpxZipFilePattern = Pattern.compile("oc[a-z]{2,3}\\d{5,}\\.zip", Pattern.CASE_INSENSITIVE);
 
     public OpenCachingConnector(final String name, final String host, final String prefix) {
         this.name = name;
         this.host = host;
-        this.prefix = prefix;
+        codePattern = Pattern.compile(prefix + "[A-Z0-9]+", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
     public boolean canHandle(String geocode) {
-        return StringUtils.startsWithIgnoreCase(geocode, prefix);
+        if (geocode == null) {
+            return false;
+        }
+        return codePattern.matcher(geocode).matches();
     }
 
     @Override