Index: lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/RegistrationDAO.java
===================================================================
diff -u -r28d293ccf980c6d523173bfe4f9d58e2b99a1865 -r7186dc7f2839c86a85616b3244e456acfd2cc669
--- lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/RegistrationDAO.java	(.../RegistrationDAO.java)	(revision 28d293ccf980c6d523173bfe4f9d58e2b99a1865)
+++ lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/RegistrationDAO.java	(.../RegistrationDAO.java)	(revision 7186dc7f2839c86a85616b3244e456acfd2cc669)
@@ -18,30 +18,34 @@
  *
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
- */ 
- 
-/* $Id$ */ 
-package org.lamsfoundation.lams.config.dao.hibernate; 
+ */
 
+/* $Id$ */
+package org.lamsfoundation.lams.config.dao.hibernate;
+
 import java.util.List;
 
 import org.lamsfoundation.lams.config.Registration;
 import org.lamsfoundation.lams.config.dao.IRegistrationDAO;
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
- 
-public class RegistrationDAO extends BaseDAO implements IRegistrationDAO{
-    
-    private static final String LOAD_REG = "from registration in class " + Registration.class.getName() ;
-    
-    public void saveOrUpdate(Registration reg){
+
+public class RegistrationDAO extends BaseDAO implements IRegistrationDAO {
+
+    private static final String LOAD_REG = "from registration in class " + Registration.class.getName();
+
+    public void saveOrUpdate(Registration reg) {
 	getHibernateTemplate().saveOrUpdate(reg);
     }
-    
+
     @SuppressWarnings("unchecked")
-    public Registration get(){
+    public Registration get() {
 	List list = getHibernateTemplate().find(LOAD_REG);
-	return (Registration)list.get(0);
+
+	if (list != null && list.get(0) != null) {
+	    return (Registration) list.get(0);
+	} else {
+	    return null;
+	}
     }
 
 }
- 
\ No newline at end of file