Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java,v
diff -u -r1.27 -r1.28
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	19 Jul 2007 07:09:47 -0000	1.27
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	21 Nov 2007 00:46:28 -0000	1.28
@@ -383,7 +383,7 @@
      */
     private boolean isParallelWaitActivity(Activity nextActivity)
     {
-        return nextActivity.getActivityTypeId().intValue()==ParallelWaitActivity.PARALLEL_WAIT_ACTIVITY_TYPE;
+        return nextActivity.getActivityTypeId()!=null && nextActivity.getActivityTypeId().intValue()==ParallelWaitActivity.PARALLEL_WAIT_ACTIVITY_TYPE;
     }
 
 	public void setActivityDAO(IActivityDAO activityDAO) {