diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 7d613fb22..af43c9f78 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -367,7 +367,7 @@ public class DataManagementPlanManager {
             throw new UnauthorisedException();
         } else
         if (!isPublic && dataManagementPlanEntity.getUsers()
-                                    .stream().noneMatch(userInfo -> userInfo.getUser().getId() == this.userScope.getUserIdSafe())) {
+                                    .stream().noneMatch(userInfo -> userInfo.getUser().getId().equals(this.userScope.getUserIdSafe()))) {
             throw new UnauthorisedException();
         } else if (isPublic && !dataManagementPlanEntity.isPublic()) {
             throw new ForbiddenException("Selected DMP is not public");
@@ -1321,7 +1321,7 @@ public class DataManagementPlanManager {
         XWPFDocument document = configLoader.getDocument();
 
         DMP dmpEntity = databaseRepository.getDmpDao().find(UUID.fromString(id));
-        if (!dmpEntity.isPublic()  && dmpEntity.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == this.userScope.getUserIdSafe()).collect(Collectors.toList()).size() == 0)
+        if (!dmpEntity.isPublic()  && dmpEntity.getUsers().stream().filter(userInfo -> userInfo.getUser().getId().equals(this.userScope.getUserIdSafe())).collect(Collectors.toList()).size() == 0)
             throw new UnauthorisedException();
 
         wordBuilder.fillFirstPage(dmpEntity, null, document, false);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
index 3ae741f0f..8c0911773 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanOverviewModel.java
@@ -217,7 +217,11 @@ public class DataManagementPlanOverviewModel implements DataModel<DMP, DataManag
         }
         this.isPublic = entity.isPublic();
         this.publishedAt = entity.getPublishedAt();
-        this.dois = entity.getDois().stream().map(item -> new Doi().fromDataModel(item)).collect(Collectors.toList());
+        if (entity.getDois() != null) {
+            this.dois = entity.getDois().stream().map(item -> new Doi().fromDataModel(item)).collect(Collectors.toList());
+        } else {
+            this.dois = new ArrayList<>();
+        }
 
         return this;
     }