Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
===================================================================
diff -u -r037520aa149bda2cdb819f8f1d28d7cd3ffebfbc -r7808273ba3a006d130a995d8561b37ef54df712e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 037520aa149bda2cdb819f8f1d28d7cd3ffebfbc)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 7808273ba3a006d130a995d8561b37ef54df712e)
@@ -75,7 +75,9 @@
 	    BeanUtils.copyProperties(ltiConsumerForm, ltiConsumer);
 
 	    SupportedLocale locale = ltiConsumer.getDefaultLocale();
-	    ltiConsumerForm.setDefaultLocaleId(locale.getLocaleId());
+	    if (locale != null) {
+		ltiConsumerForm.setDefaultLocaleId(locale.getLocaleId());
+	    }
 	} else {
 	    // do nothing in case of creating a tool consumer
 	}