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 0671d21ad..cb10a4f2e 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
@@ -126,9 +126,10 @@ public final class ConnectionFactory {
     private static String getConnectionString() throws IOException {
         final String connStr = Settings.getString(Settings.KEYS.DB_CONNECTION_STRING, "jdbc:h2:file:%s;AUTO_SERVER=TRUE");
         if (connStr.contains("%s")) {
-            final String fileName = getDataDirectory().getCanonicalPath();
-            final File file = new File(fileName, "cve." + DB_SCHEMA_VERSION);
-            return String.format(connStr, file.getAbsolutePath());
+            final String directory = getDataDirectory().getCanonicalPath();
+            final File data_file = new File(directory, "cve." + DB_SCHEMA_VERSION);
+            Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, String.format("File path for H2 file: '%s'", data_file.toString()));
+            return String.format(connStr, data_file.getAbsolutePath());
         }
         return connStr;
     }
diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java
index 9366ffcf0..db57f52bf 100644
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java
@@ -276,13 +276,18 @@ public final class Settings {
      */
     public static File getDataFile(String key) {
         final String file = getString(key);
+        Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - file: '%s'", file));
         if (file == null) {
             return null;
         }
-        if (file.startsWith("[JAR]/")) {
+        if (file.startsWith("[JAR]")) {
+            Logger.getLogger(Settings.class.getName()).log(Level.FINE, "Settings.getDataFile() - transforming filename");
             final File jarPath = getJarPath();
+            Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - jar file: '%s'", jarPath.toString()));
             final File newBase = new File(jarPath, file.substring(6));
-            return new File(newBase, file);
+            File retVal = new File(newBase, file);
+            Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - returning: '%s'", retVal.toString()));
+            return retVal;
         }
         return new File(file);
     }