diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
index e1e5819ca..462c20a52 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
@@ -96,6 +96,10 @@ public class CveDB {
                 final String msg = "There was an error attempting to close the CveDB, see the log for more details.";
                 Logger.getLogger(DBUtils.class.getName()).log(Level.SEVERE, msg);
                 Logger.getLogger(DBUtils.class.getName()).log(Level.FINE, null, ex);
+            } catch (Throwable ex) {
+                final String msg = "There was an exception attempting to close the CveDB, see the log for more details.";
+                Logger.getLogger(DBUtils.class.getName()).log(Level.SEVERE, msg);
+                Logger.getLogger(DBUtils.class.getName()).log(Level.FINE, null, ex);
             }
             conn = null;
         }
@@ -128,7 +132,9 @@ public class CveDB {
      * @throws Throwable thrown if there is a problem
      */
     @Override
+    @SuppressWarnings("FinalizeDeclaration")
     protected void finalize() throws Throwable {
+        Logger.getLogger(DBUtils.class.getName()).log(Level.FINE, "Entering finalize");
         close();
         super.finalize();
     }