Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java,v
diff -u -r1.25 -r1.26
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	29 Sep 2015 22:53:18 -0000	1.25
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	30 Sep 2015 14:06:04 -0000	1.26
@@ -212,9 +212,12 @@
 
 	    JSONObject responseRow = new JSONObject();
 	    responseRow.put("id", organisation.getOrganisationId());
-	    responseRow.put("name", StringEscapeUtils.escapeHtml(organisation.getName()));
-	    responseRow.put("code", StringEscapeUtils.escapeHtml(organisation.getCode()));
-	    responseRow.put("description", StringEscapeUtils.escapeHtml(organisation.getDescription()));
+	    String orgName = organisation.getName() == null ? "" : organisation.getName(); 
+	    responseRow.put("name", StringEscapeUtils.escapeHtml(orgName));
+	    String orgCode = organisation.getCode() == null ? "" : organisation.getCode(); 
+	    responseRow.put("code", StringEscapeUtils.escapeHtml(orgCode));
+	    String orgDescription = organisation.getDescription() == null ? "" : organisation.getDescription(); 
+	    responseRow.put("description", StringEscapeUtils.escapeHtml(orgDescription));
 
 	    rows.put(responseRow);
 	}