Index: lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java
===================================================================
diff -u -r99beeb8773776122e621256bb35fd4539aeac75f -r347ad503a9dc28b50b249b1654feefdc1393ccd1
--- lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision 99beeb8773776122e621256bb35fd4539aeac75f)
+++ lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java	(.../SignupService.java)	(revision 347ad503a9dc28b50b249b1654feefdc1393ccd1)
@@ -118,7 +118,9 @@
     public SignupOrganisation getSignupOrganisation(String context) {
 	SignupOrganisation result = signupDAO.getSignupOrganisation(context);
 	// initialize lazy-loaded organisation here, so it can be used in JSP produced by SignupController#execute()
-	Hibernate.initialize(result.getOrganisation());
+	if (result != null) {
+	    Hibernate.initialize(result.getOrganisation());
+	}
 	return result;
     }