Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java =================================================================== diff -u -r816d737357c53cf37f8c1805a9baf5d5166cc3c1 -r72154354672e85f1117ba5f94044c94477e36a6e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 816d737357c53cf37f8c1805a9baf5d5166cc3c1) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 72154354672e85f1117ba5f94044c94477e36a6e) @@ -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 =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -r72154354672e85f1117ba5f94044c94477e36a6e --- lams_tool_notebook/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_notebook/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision 72154354672e85f1117ba5f94044c94477e36a6e) @@ -50,31 +50,33 @@ ${user.firstName} ${user.lastName } -