Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.70 -r1.71
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	5 Sep 2007 08:09:30 -0000	1.70
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	17 Sep 2007 01:22:35 -0000	1.71
@@ -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();