diff --git a/url-detector/pom.xml b/url-detector/pom.xml
index fb830f2..59ceb99 100644
--- a/url-detector/pom.xml
+++ b/url-detector/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.linkedin.urls</groupId>
   <artifactId>url-detector</artifactId>
-  <version>0.1.17</version>
+  <version>0.1.18</version>
   <packaging>jar</packaging>
 
   <name>com.linkedin.urls:url-detector</name>
diff --git a/url-detector/src/main/java/com/linkedin/urls/Url.java b/url-detector/src/main/java/com/linkedin/urls/Url.java
index d4ed937..d287a51 100644
--- a/url-detector/src/main/java/com/linkedin/urls/Url.java
+++ b/url-detector/src/main/java/com/linkedin/urls/Url.java
@@ -114,7 +114,8 @@ public String getFullUrlWithoutFragment() {
     }
 
     url.append(getHost());
-    if (getPort() > 0 && getPort() != SCHEME_PORT_MAP.get(getScheme())) {
+    Integer schemePort = SCHEME_PORT_MAP.get(getScheme());
+    if (getPort() > 0 && (schemePort != null) && (getPort() != schemePort)) {
       url.append(":");
       url.append(getPort());
     }