diff --git a/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java b/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java
index b7134acc..f27d9fe3 100644
--- a/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java
+++ b/client/src/main/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcher.java
@@ -14,7 +14,7 @@ public LessThanOrEqualToSemverMatcher(String semVer) {
 
     @Override
     public boolean match(Object matchValue, String bucketingKey, Map<String, Object> attributes, EvaluationContext evaluationContext) {
-        if (matchValue == null) {
+        if (matchValue == null || _semVer == null) {
             return false;
         }
         Semver matchSemver = Semver.build(matchValue.toString());
@@ -22,7 +22,7 @@ public boolean match(Object matchValue, String bucketingKey, Map<String, Object>
             return false;
         }
 
-        return _semVer != null && matchSemver.Compare(_semVer) <= 0;
+        return matchSemver.Compare(_semVer) <= 0;
     }
 
     @Override
diff --git a/client/src/test/java/io/split/engine/matchers/GreaterThanOrEqualToSemverMatcherTest.java b/client/src/test/java/io/split/engine/matchers/GreaterThanOrEqualToSemverMatcherTest.java
index 5cd90cb4..2d72d3c7 100644
--- a/client/src/test/java/io/split/engine/matchers/GreaterThanOrEqualToSemverMatcherTest.java
+++ b/client/src/test/java/io/split/engine/matchers/GreaterThanOrEqualToSemverMatcherTest.java
@@ -14,7 +14,6 @@ public class GreaterThanOrEqualToSemverMatcherTest {
     @Test
     public void works() {
         GreaterThanOrEqualToSemverMatcher greaterThanOrEqualToSemverMatcher = new GreaterThanOrEqualToSemverMatcher("2.1.8");
-
         assertTrue( greaterThanOrEqualToSemverMatcher.match("2.1.8", null, null, null));
         assertTrue( greaterThanOrEqualToSemverMatcher.match("2.1.9", null, null, null));
         assertFalse( greaterThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null));
diff --git a/client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java b/client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java
index 6be2333a..ad12dc8c 100644
--- a/client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java
+++ b/client/src/test/java/io/split/engine/matchers/LessThanOrEqualToSemverMatcherTest.java
@@ -3,6 +3,7 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 /**
  * Tests for EqualToSemverMatcher
@@ -14,10 +15,10 @@ public class LessThanOrEqualToSemverMatcherTest {
     public void works() {
         LessThanOrEqualToSemverMatcher lessThanOrEqualToSemverMatcher = new LessThanOrEqualToSemverMatcher("2.1.8");
 
-        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8", null, null, null) == true);
-        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.9", null, null, null) == false);
-        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null) == true);
-        assertTrue( lessThanOrEqualToSemverMatcher.match("2.0.10", null, null, null) == true);
-        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8+build", null, null, null) == true);
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8", null, null, null));
+        assertFalse( lessThanOrEqualToSemverMatcher.match("2.1.9", null, null, null));
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8-rc", null, null, null));
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.0.10", null, null, null));
+        assertTrue( lessThanOrEqualToSemverMatcher.match("2.1.8+build", null, null, null));
     }
 }