Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java,v
diff -u -r1.23 -r1.24
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	21 Jun 2006 12:03:17 -0000	1.23
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java	23 Jun 2006 07:57:10 -0000	1.24
@@ -222,7 +222,7 @@
             {
                 // display next activity
                 activityURL = this.getActivityURL(progress.getNextActivity());
-                if (progress.getPreviousActivity().isParallelActivity())
+                if (progress.getPreviousActivity() != null && progress.getPreviousActivity().isParallelActivity())
                 {
                     // if previous activity was a parallel activity then we need to
                     // clear frames.