Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java,v
diff -u -r1.29 -r1.29.2.1
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	21 Apr 2014 13:34:43 -0000	1.29
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	18 Aug 2015 08:25:39 -0000	1.29.2.1
@@ -157,21 +157,24 @@
 	
 	ToolSession toolSession = this.getToolSession(toolSessionId);
 	ToolActivity specifiedActivity = toolSession.getToolActivity();
-	Activity leaderSelectionActivity = getNearestLeaderSelectionActivity(specifiedActivity, learnerId, toolSession.getLesson().getLessonId());
+	Activity leaderSelectionActivity = getNearestLeaderSelectionActivity(specifiedActivity, learnerId,
+		toolSession.getLesson().getLessonId());
 
 	// check if there is leaderSelectionTool available
 	if (leaderSelectionActivity != null) {
 	    User learner = (User) toolContentDAO.find(User.class, learnerId);
 	    String outputName = LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID;
 	    ToolSession leaderSelectionSession = toolSessionDAO.getToolSessionByLearner(learner,
 		    leaderSelectionActivity);
+	    if (leaderSelectionSession != null) {
 	    ToolOutput output = lamsCoreToolService.getOutputFromTool(outputName, leaderSelectionSession, null);
 
 	    // check if tool produced output
 	    if (output != null && output.getValue() != null) {
 		leaderUserId = output.getValue().getLong();
 	    }
 	}
+	}
 
 	return leaderUserId;
     }