diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java
index 3efca8562..912335f84 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java
@@ -209,7 +209,7 @@ public class Evidence implements Serializable, Comparable<Evidence> {
     @Override
     public int compareTo(Evidence o) {
         if (o == null) {
-            throw new NullPointerException("Unable to compare null evidence");
+            throw new IllegalArgumentException("Unable to compare null evidence");
         }
         if (StringUtils.equalsIgnoreCase(source, o.source)) {
             if (StringUtils.equalsIgnoreCase(name, o.name)) {
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java
index ee1e16f55..5cfa66e6d 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Identifier.java
@@ -262,7 +262,7 @@ public class Identifier implements Serializable, Comparable<Identifier> {
     @Override
     public int compareTo(Identifier o) {
         if (o == null) {
-            throw new NullPointerException("Unable to compare a null identifier");
+            throw new IllegalArgumentException("Unable to compare a null identifier");
         }
         return new CompareToBuilder()
                 .append(this.type, o.type)
diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java
index ac3268cf6..8170435a0 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/RubyBundleAuditAnalyzerIT.java
@@ -22,7 +22,6 @@ import edu.emory.mathcs.backport.java.util.Arrays;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.SortedSet;
 
 import org.junit.After;
 import org.junit.Assume;