Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java	1 Nov 2006 23:58:00 -0000	1.5
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java	22 May 2007 07:13:08 -0000	1.6
@@ -126,8 +126,10 @@
 		sessionDTO.setSessionName(notebookSession.getSessionName());
 		sessionDTO.setSessionID(notebookSession.getSessionId());
 
-		NotebookUserDTO userDTO = new NotebookUserDTO(notebookUser,
-				notebookEntry);
+		// If the user hasn't put in their entry yet, notebookEntry will be null;
+		NotebookUserDTO userDTO = notebookEntry != null 
+			? new NotebookUserDTO(notebookUser,notebookEntry) 
+			: new NotebookUserDTO(notebookUser);
 
 		sessionDTO.getUserDTOs().add(userDTO);
 		notebookDTO.getSessionDTOs().add(sessionDTO);
Index: lams_tool_notebook/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_notebook/web/pages/export/exportPortfolio.jsp	28 Sep 2006 23:31:51 -0000	1.5
+++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp	22 May 2007 07:13:26 -0000	1.6
@@ -50,31 +50,33 @@
 										${user.firstName} ${user.lastName }
 									</th>
 								</tr>
-								<tr>
-									<td class="field-name" width="20%">
-										<fmt:message key="label.created" />
-									</td>
-									<td>
-										<lams:Date value="${user.entryDTO.createDate }"></lams:Date>
-									</td>
-								</tr>
-								<tr>
-									<td class="field-name" width="20%">
-										<fmt:message key="label.lastModified" />
-									</td>
-									<td>
-										<lams:Date value="${user.entryDTO.lastModified }"></lams:Date>
-									</td>
-								</tr>
-
-								<tr>
-									<td class="field-name">
-										<fmt:message key="label.notebookEntry" />
-									</td>
-									<td>
-										<c:out value="${user.entryDTO.entry}" escapeXml="false"></c:out>
-									</td>
-								</tr>
+								<c:if test="${not empty user.entryDTO}">
+									<tr>
+										<td class="field-name" width="20%">
+											<fmt:message key="label.created" />
+										</td>
+										<td>
+											<lams:Date value="${user.entryDTO.createDate }"></lams:Date>
+										</td>
+									</tr>
+									<tr>
+										<td class="field-name" width="20%">
+											<fmt:message key="label.lastModified" />
+										</td>
+										<td>
+											<lams:Date value="${user.entryDTO.lastModified }"></lams:Date>
+										</td>
+									</tr>
+	
+									<tr>
+										<td class="field-name">
+											<fmt:message key="label.notebookEntry" />
+										</td>
+										<td>
+											<c:out value="${user.entryDTO.entry}" escapeXml="false"></c:out>
+										</td>
+									</tr>
+								</c:if>
 							</table>
 						</c:forEach>
 					</div>