Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
===================================================================
diff -u -rfe06d16b234341fc965d9b40494e6a2fb4cb9438 -rce8670477b9f0a3e59b6706c2d9720b9180e5733
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	(.../AuthoringActivityDTO.java)	(revision fe06d16b234341fc965d9b40494e6a2fb4cb9438)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java	(.../AuthoringActivityDTO.java)	(revision ce8670477b9f0a3e59b6706c2d9720b9180e5733)
@@ -454,12 +454,15 @@
 
     }
 
+    @SuppressWarnings("unchecked")
     private void addConditionGateActivityAttributes(ConditionGateActivity activity,
 	    ArrayList<BranchActivityEntryDTO> branchMappings) {
-	Iterator iter = activity.getBranchActivityEntries().iterator();
-	while (iter.hasNext()) {
-	    BranchActivityEntry ba = (BranchActivityEntry) iter.next();
-	    branchMappings.add(ba.getBranchActivityEntryDTO(toolActivityUIID));
+	if (activity.getBranchActivityEntries() != null) {
+	    Iterator<BranchActivityEntry> iter = activity.getBranchActivityEntries().iterator();
+	    while (iter.hasNext()) {
+		BranchActivityEntry ba = iter.next();
+		branchMappings.add(ba.getBranchActivityEntryDTO(toolActivityUIID));
+	    }
 	}
     }