diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/Sw360ProjectService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/Sw360ProjectService.java index 4dd89a41d4..a15ba7b963 100644 --- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/Sw360ProjectService.java +++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/Sw360ProjectService.java @@ -643,7 +643,7 @@ public Set getReleaseIds(String projectId, User sw360User, boolean trans public void addEmbeddedLinkedProject(Project sw360Project, User sw360User, HalResource projectResource, Set projectIdsInBranch) throws TException { projectIdsInBranch.add(sw360Project.getId()); Map linkedProjects = sw360Project.getLinkedProjects(); - List keys = new ArrayList<>(linkedProjects.keySet()); + List keys = linkedProjects != null ? new ArrayList<>(linkedProjects.keySet()) : new ArrayList<>(); if (keys != null) { keys.forEach(linkedProjectId -> wrapTException(() -> { if (projectIdsInBranch.contains(linkedProjectId)) {