Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
diff -u -r2c26811b29dbe08f4d569c720f86b25925260fc0 -r6a78e6194ce21512039bd7ace17b83701663f029
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision 2c26811b29dbe08f4d569c720f86b25925260fc0)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision 6a78e6194ce21512039bd7ace17b83701663f029)
@@ -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) {