Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceDAO.java
===================================================================
diff -u -r55901923afea1cbd769d8daa05051aa050bb99b6 -ra2b21903bd43b5a604e3ca7edef11dde1351018c
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceDAO.java	(.../WorkspaceDAO.java)	(revision 55901923afea1cbd769d8daa05051aa050bb99b6)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/WorkspaceDAO.java	(.../WorkspaceDAO.java)	(revision a2b21903bd43b5a604e3ca7edef11dde1351018c)
@@ -23,6 +23,7 @@
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
 import java.util.List;
+
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.usermanagement.Workspace;
 import org.lamsfoundation.lams.usermanagement.dao.IWorkspaceDAO;
@@ -47,6 +48,9 @@
 	}
 	public Workspace getWorkspaceByRootFolderID(Integer rootFolderID){
 		List list = this.getHibernateTemplate().find(FIND_BY_ROOT_FOLDER,rootFolderID);
-		return (Workspace)list.get(0);	
+		if(list.size()!=0)
+			return (Workspace)list.get(0);
+		else
+			return null;
 	}
 }