Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== diff -u -rdd42ee56aadaa0f237dd0766a197cb418f182b7e -r9e07db992848ed0a7724d5c6471af535465097a7 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision dd42ee56aadaa0f237dd0766a197cb418f182b7e) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision 9e07db992848ed0a7724d5c6471af535465097a7) @@ -757,7 +757,7 @@ log.debug("Forced the user into group "+group+" for branching purposes."); } - if ( group != null ) { + if ( group != null && group.getBranchActivities() != null ) { Iterator branchesIterator = group.getBranchActivities().iterator(); while (sequenceActivity==null && branchesIterator.hasNext()) { GroupBranchActivityEntry branchActivityEntry = (GroupBranchActivityEntry) branchesIterator.next();