Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java,v
diff -u -r1.8 -r1.9
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	23 Nov 2006 06:00:19 -0000	1.8
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java	7 Feb 2007 01:41:11 -0000	1.9
@@ -139,8 +139,10 @@
 		}
 		
 		// get any existing notebook entry
-		NotebookEntry nbEntry = notebookService.getEntry(notebookUser
-				.getEntryUID());
+		NotebookEntry nbEntry = null;
+		if ( notebookUser != null ) {
+			nbEntry = notebookService.getEntry(notebookUser.getEntryUID());
+		}
 		if (nbEntry != null) {
 			learningForm.setEntryText(nbEntry.getEntry());
 		}
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_notebook/web/pages/learning/notebook.jsp	3 Dec 2006 03:33:01 -0000	1.15
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	7 Feb 2007 01:41:14 -0000	1.16
@@ -37,17 +37,19 @@
 							styleClass="text-area"></html:textarea>
 					</c:otherwise>
 				</c:choose>
+
+				<div class="space-bottom-top align-right">
+					<html:submit styleClass="button" styleId="finishButton">
+						<fmt:message>button.finish</fmt:message>
+					</html:submit>
+				</div>
+
 			</c:when>
 
 			<c:otherwise>
 					<lams:out value="${lrnForm.entryText}" />
 				</c:otherwise>
 		</c:choose>
 
-		<div class="space-bottom-top align-right">
-			<html:submit styleClass="button" styleId="finishButton">
-				<fmt:message>button.finish</fmt:message>
-			</html:submit>
-		</div>
 	</html:form>
 </div>