Index: lams_central/src/java/org/lamsfoundation/lams/web/RedirectAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/RedirectAction.java,v
diff -u -r1.4 -r1.5
--- lams_central/src/java/org/lamsfoundation/lams/web/RedirectAction.java	21 Oct 2008 05:11:05 -0000	1.4
+++ lams_central/src/java/org/lamsfoundation/lams/web/RedirectAction.java	27 Jan 2012 11:43:48 -0000	1.5
@@ -124,6 +124,12 @@
 	    // Get the tool session
 	    ToolSession toolSession = getToolSession(toolSessionID);
 
+	    if (toolSession == null) {
+		log.error("No ToolSession with ID " + toolSessionID + " found.");
+		return mapping.findForward("error");
+	    }
+	    
+
 	    // Get the lesson
 	    Lesson lesson = toolSession.getLesson();