diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java
index 43c8c97d5..cd4ef2628 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java
@@ -185,6 +185,9 @@ public final class ConnectionFactory {
                 DriverManager.deregisterDriver(driver);
             } catch (SQLException ex) {
                 Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "An error occured unloading the databse driver", ex);
+            } catch (Throwable unexpected) {
+                Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE,
+                        "An unexpected throwable occured unloading the databse driver", unexpected);
             }
             driver = null;
         }