From bf784456d6ef73ccfadf12d3fcc13efc04d38ef1 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Mon, 21 Sep 2020 10:15:38 +0200
Subject: [PATCH] Fixes #6863

---
 .../java/org/jabref/model/database/BibDatabaseContext.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 9c3c76ff593..a1ad8552b66 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -136,7 +136,6 @@ public List<Path> getFileDirectoriesAsPaths(FilePreferences preferences) {
 
         // 4. BIB file directory
         getDatabasePath().ifPresent(dbPath -> {
-            Objects.requireNonNull(dbPath, "dbPath is null");
             Path parentPath = dbPath.getParent();
             if (parentPath == null) {
                 parentPath = Path.of(System.getProperty("user.dir"));
@@ -146,6 +145,8 @@ public List<Path> getFileDirectoriesAsPaths(FilePreferences preferences) {
             // Check if we should add it as primary file dir (first in the list) or not:
             if (preferences.isBibLocationAsPrimary()) {
                 fileDirs.add(0, parentPath);
+            } else {
+                fileDirs.add(parentPath);
             }
         });