Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rdec0519643f16af8348fc85bc97332dc1ba0d639 -r56e673c6a6897edeea5967c0839e402223698d99
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java
===================================================================
diff -u -r03abda6aa87eacaaab4f2ffa4fdd2daa98bebf87 -r56e673c6a6897edeea5967c0839e402223698d99
--- lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	(.../NotebookEntryDAO.java)	(revision 03abda6aa87eacaaab4f2ffa4fdd2daa98bebf87)
+++ lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java	(.../NotebookEntryDAO.java)	(revision 56e673c6a6897edeea5967c0839e402223698d99)
@@ -45,7 +45,11 @@
 	}
 
 	public NotebookEntry get(Long uid) {
-		Object o = getHibernateTemplate().get(NotebookEntry.class, uid);
-        return (NotebookEntry)o;
+		if (uid != null) {
+			Object o = getHibernateTemplate().get(NotebookEntry.class, uid);
+			return (NotebookEntry)o;
+		} else {
+			return null;
+		}
 	}
 }