Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -r97612142f4697066beb66064e83ff31fef1712b9 -re0cea12ca5bf8260f519e9b8676bbc45966b628c
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 97612142f4697066beb66064e83ff31fef1712b9)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision e0cea12ca5bf8260f519e9b8676bbc45966b628c)
@@ -873,21 +873,15 @@
     		throw new LearnerServiceException(error);
     	}
 
-    	Activity activity = activityDAO.getActivityByActivityId(branchId, Activity.class);
-    	if ( activity !=null ) {
+    	SequenceActivity selectedBranch = (SequenceActivity) activityDAO.getActivityByActivityId(branchId, SequenceActivity.class);
+    	if ( selectedBranch !=null ) {
 
-    		if ( !activity.isSequenceActivity() ) {
-        		String error = "selectBranch: activity "+activity+" Is not a sequence activity. Unable to branch.";
+    		if ( selectedBranch.getParentActivity() == null ||  !selectedBranch.getParentActivity().equals(branchingActivity) ) {
+        		String error = "selectBranch: activity "+selectedBranch+" is not a branch within the branching activity "+branchingActivity+". Unable to branch.";
         		log.error(error);
         		throw new LearnerServiceException(error);
     		} 
-    		if ( activity.getParentActivity() == null ||  !activity.getParentActivity().equals(branchingActivity) ) {
-        		String error = "selectBranch: activity "+activity+" is not a branch within the branching activity "+branchingActivity+". Unable to branch.";
-        		log.error(error);
-        		throw new LearnerServiceException(error);
-    		} 
     		
-    		SequenceActivity selectedBranch = (SequenceActivity) activity;
     		Set<Group> groups = selectedBranch.getGroupsForBranch();
     		Grouping grouping = branchingActivity.getGrouping();