diff --git a/src/main/java/org/datadog/jmxfetch/util/JavaVersion.java b/src/main/java/org/datadog/jmxfetch/util/JavaVersion.java
index b6342776..0468059c 100644
--- a/src/main/java/org/datadog/jmxfetch/util/JavaVersion.java
+++ b/src/main/java/org/datadog/jmxfetch/util/JavaVersion.java
@@ -24,6 +24,11 @@ private static int getMajorJavaVersion() {
     }
 
     private static int parseMajorJavaVersion(String str) {
+        int indexOfDash = str.indexOf('-');
+        if (indexOfDash >= 0) {
+            str = str.substring(0, indexOfDash);
+        }
+
         int value = 0;
         for (int i = 0; i < str.length(); i++) {
             char ch = str.charAt(i);
@@ -35,6 +40,8 @@ private static int parseMajorJavaVersion(String str) {
                 } else {
                     break;
                 }
+            } else if (ch == '+') {
+                break;
             } else {
                 throw new NumberFormatException();
             }