diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java
index f89c08fdb..0b0fbc051 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java
@@ -286,14 +286,12 @@ public class CPEAnalyzer implements Analyzer {
             return ret;
         } catch (ParseException ex) {
             final String msg = String.format("Unable to parse: %s", searchString);
-            Logger.getLogger(CPEAnalyzer.class.getName()).log(Level.WARNING,
-                    "An error occured querying the CPE data. See the log for more details.");
-            Logger.getLogger(CPEAnalyzer.class.getName()).log(Level.INFO, msg, ex);
+            LOGGER.log(Level.WARNING, "An error occured querying the CPE data. See the log for more details.");
+            LOGGER.log(Level.INFO, msg, ex);
         } catch (IOException ex) {
             final String msg = String.format("IO Error with search string: %s", searchString);
-            Logger.getLogger(CPEAnalyzer.class.getName()).log(Level.WARNING,
-                    "An error occured reading CPE data. See the log for more details.");
-            Logger.getLogger(CPEAnalyzer.class.getName()).log(Level.INFO, msg, ex);
+            LOGGER.log(Level.WARNING, "An error occured reading CPE data. See the log for more details.");
+            LOGGER.log(Level.INFO, msg, ex);
         }
         return null;
     }
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java
index 819e7a798..4ee930733 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java
@@ -54,7 +54,9 @@ public final class DBUtils {
         int id = 0;
         try {
             rs = statement.getGeneratedKeys();
-            rs.next();
+            if (!rs.next()) {
+                throw new DatabaseException("Unable to get primary key for inserted row");
+            }
             id = rs.getInt(1);
         } catch (SQLException ex) {
             throw new DatabaseException("Unable to get primary key for inserted row");