Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -r122ff0d8419be3fac72ddb842cbbce1cea01e542 -re97dcb50701feb5f8cfd666de05caf9d0cd69bd6 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 122ff0d8419be3fac72ddb842cbbce1cea01e542) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision e97dcb50701feb5f8cfd666de05caf9d0cd69bd6) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.service; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.LinkedHashSet; @@ -479,11 +480,18 @@ Activity confidenceLevelActivity = activityDAO.getActivityByUIID(confidenceLevelActivityUiid, requestorSession.getToolActivity().getLearningDesign()); + if (confidenceLevelActivity == null) { + log.debug("No confidence Levels providing activity found for activityUid " + confidenceLevelActivityUiid); + return new ArrayList<>(); + } ToolSession confidenceLevelSession = toolSessionDAO.getToolSessionByLearner(user, confidenceLevelActivity); + if (confidenceLevelSession == null) { + log.debug("No session found for user " + user.getUserId() + " in activity " + confidenceLevelActivityUiid); + return new ArrayList<>(); + } List confidenceLevelDtos = lamsCoreToolService .getConfidenceLevelsByToolSession(confidenceLevelSession); - return confidenceLevelDtos; }