Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java
===================================================================
diff -u -r7b9b1931a178ac9bac070531b53731383df0a187 -r811be59c3ae236a4115c54313e72081aff89bdff
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java	(.../ConfigAction.java)	(revision 7b9b1931a178ac9bac070531b53731383df0a187)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java	(.../ConfigAction.java)	(revision 811be59c3ae236a4115c54313e72081aff89bdff)
@@ -95,13 +95,14 @@
 		
 		for(int i=0; i<keys.length; i++) {
 			ConfigurationItem item = getConfiguration().getConfigItemByKey(keys[i]);
+	
 			
-			// return to ldap page if that's where we came from
-			if (StringUtils.contains(item.getHeaderName(), "config.header.ldap")) {
-			    errorForward = "ldap";
-			}
-			
-			if (item!=null) {
+			if (item!=null) {		
+				// return to ldap page if that's where we came from
+				if (StringUtils.contains(item.getHeaderName(), "config.header.ldap")) {
+				    errorForward = "ldap";
+				}
+				
 				if (item.getRequired()) {
 					if (!(values[i]!=null && values[i].length()>0)) {
 						request.setAttribute("error", getRequiredError(item.getDescriptionKey()));