Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java,v
diff -u -r1.6 -r1.6.2.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java	9 Nov 2009 05:47:21 -0000	1.6
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java	20 Nov 2014 15:11:36 -0000	1.6.2.1
@@ -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()));