Index: lams_central/src/java/org/lamsfoundation/lams/web/RedirectAction.java
===================================================================
diff -u -r452f9138a56e9a5a05fae4f631067be1f53b4b08 -re8f43f66612f0ccc2fc6479651004a2a054bdc6f
--- lams_central/src/java/org/lamsfoundation/lams/web/RedirectAction.java	(.../RedirectAction.java)	(revision 452f9138a56e9a5a05fae4f631067be1f53b4b08)
+++ lams_central/src/java/org/lamsfoundation/lams/web/RedirectAction.java	(.../RedirectAction.java)	(revision e8f43f66612f0ccc2fc6479651004a2a054bdc6f)
@@ -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();