diff --git a/src/main/java/eu/europa/ec/fisheries/uvms/rest/security/bean/USMServiceBean.java b/src/main/java/eu/europa/ec/fisheries/uvms/rest/security/bean/USMServiceBean.java index b33cbf4..87d678c 100644 --- a/src/main/java/eu/europa/ec/fisheries/uvms/rest/security/bean/USMServiceBean.java +++ b/src/main/java/eu/europa/ec/fisheries/uvms/rest/security/bean/USMServiceBean.java @@ -346,7 +346,7 @@ public List getDatasetsPerCategory(String category, String username, St public List getDatasetsPerCategory(String category, Context userContext) throws ServiceException { LOG.debug("START getDatasetsPerCategory({}, {})", category, userContext); List filteredDatasets = new LinkedList<>(); - if (userContext != null) { + if (userContext != null && userContext.getScope() != null) { List datasetList = userContext.getScope().getDataset(); for (Dataset dataset : datasetList) {