diff --git a/pom.xml b/pom.xml
index 0e79dcd..f3985fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <junit.version>4.11</junit.version>
   </properties>
   <build>
     <plugins>
@@ -61,6 +62,15 @@
           </execution>
         </executions>
       </plugin>
+
     </plugins>
   </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/src/main/java/net/pieroxy/ua/detection/UserAgentDetectionHelper.java b/src/main/java/net/pieroxy/ua/detection/UserAgentDetectionHelper.java
index 7a69a78..86826ab 100644
--- a/src/main/java/net/pieroxy/ua/detection/UserAgentDetectionHelper.java
+++ b/src/main/java/net/pieroxy/ua/detection/UserAgentDetectionHelper.java
@@ -1,6 +1,5 @@
 package net.pieroxy.ua.detection;
-import java.io.*;
-import java.util.*;
+
 class UserAgentDetectionHelper {
 
     public static void consumeMozilla(UserAgentContext context) {
@@ -54,6 +53,8 @@ public static void addExtensionsCommonForLibs(UserAgentContext context, UserAgen
     }
 
     public static boolean greaterThan(String integer, int target) {
+        if (integer == null || integer.length() == 0)
+            return false;
         String beginning = integer;
         for (int i=0 ; i<integer.length() ; i++) {
             if (Character.isDigit(integer.charAt(i))) continue;
diff --git a/src/main/test/net/pieroxy/ua/tooling/UserAgentDetectorTest.java b/src/main/test/net/pieroxy/ua/tooling/UserAgentDetectorTest.java
new file mode 100644
index 0000000..5ea36a7
--- /dev/null
+++ b/src/main/test/net/pieroxy/ua/tooling/UserAgentDetectorTest.java
@@ -0,0 +1,16 @@
+package net.pieroxy.ua.tooling;
+
+import net.pieroxy.ua.detection.UserAgentDetector;
+import org.junit.Test;
+
+/**
+ * @author sam
+ */
+public class UserAgentDetectorTest {
+    @Test
+    public void testEnsureNullPointerExceptionBugFixed() {
+        String userAgent = "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5 Build/MMB29Q; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/48.0.2564.106 Mobile Safari/537.36 MobileApp/1.0 (Android; 4.0.3; com.ebay.kr.g9)";
+        UserAgentDetector detector = new UserAgentDetector();
+        detector.parseUserAgent(userAgent);
+    }
+}