Index: lams_central/test/java/org/lamsfoundation/lams/workspace/service/TestWorkspaceManagement.java
===================================================================
diff -u -r9bef1de27d0d527d75191115a535bc2c4311ade9 -r1b22f6b7113cbdf0644492c4f287d720466d05b6
--- lams_central/test/java/org/lamsfoundation/lams/workspace/service/TestWorkspaceManagement.java	(.../TestWorkspaceManagement.java)	(revision 9bef1de27d0d527d75191115a535bc2c4311ade9)
+++ lams_central/test/java/org/lamsfoundation/lams/workspace/service/TestWorkspaceManagement.java	(.../TestWorkspaceManagement.java)	(revision 1b22f6b7113cbdf0644492c4f287d720466d05b6)
@@ -204,7 +204,10 @@
 	 * @return
 	 */
 	private WorkspaceFolderContent getMatchingContent(NodeKey nk, Long folderId) {
+		assertNotNull(nk);
+		assertNotNull(folderId);
 		List contentList = workspaceFolderContentDAO.getContentByWorkspaceFolder(folderId);
+		assertNotNull(contentList);
 		Iterator iter = contentList.iterator();
 		while (iter.hasNext()) {
 			WorkspaceFolderContent element = (WorkspaceFolderContent) iter.next();