Merge OpenOLAT 9.3 to OpenOLAT default branch with 9395e31b5b685c8e95923a5cb9d3a6b0b454751c

src/main/java/org/olat/admin/user/UserSearchFlexiController.java

@@ -235,9 +235,12 @@ public class UserSearchFlexiController extends FlexiAutoCompleterController {
 		}
 	}
 	
+	@Override
 	protected String getSearchValue(UserRequest ureq) {
-		String searchValue = ureq.getParameter(autoCompleterContainer.getId(JSNAME_INPUTFIELD));
-		return searchValue;
+		if(autoCompleterContainer != null) {
+			return ureq.getParameter(autoCompleterContainer.getId(JSNAME_INPUTFIELD));
+		}
+		return null;
 	}
 
 	@Override

src/main/java/org/olat/admin/user/imp/ImportStep00.java

@@ -305,15 +305,26 @@ class ImportStep00 extends BasicStep {
 				}
 				boolean isMandatoryField = um.isMandatoryUserProperty(usageIdentifyer, userPropertyHandler);
 				if (isMandatoryField && !StringHelper.containsNonWhitespace(thisValue)) {
-					textAreaElement.setErrorKey("error.mandatory", new String[] { String.valueOf(i + 1), translate(userPropertyHandler.i18nFormElementLabelKey()) });
+					String label = "";
+					if(userPropertyHandler.i18nFormElementLabelKey() != null) {
+						label = translate(userPropertyHandler.i18nFormElementLabelKey());
+					}
+					textAreaElement.setErrorKey("error.mandatory", new String[] { String.valueOf(i + 1), label });
 					importDataError = true;
 					break;
 				}
 				// used for call-back value depending on PropertyHandler
 				ValidationError validationError = new ValidationError();
 				if (!userPropertyHandler.isValidValue(null, thisValue, validationError, getLocale())) {
-					textAreaElement.setErrorKey("error.lengthorformat", new String[] { String.valueOf(i + 1), translate(userPropertyHandler.i18nFormElementLabelKey()),
-							translate(validationError.getErrorKey(), validationError.getArgs()) });
+					String error = "unkown";
+					String label = "";
+					if(userPropertyHandler.i18nFormElementLabelKey() != null) {
+						label = translate(userPropertyHandler.i18nFormElementLabelKey());
+					}
+					if(validationError.getErrorKey() != null) {
+						error = translate(validationError.getErrorKey(), validationError.getArgs());
+					}
+					textAreaElement.setErrorKey("error.lengthorformat", new String[] { String.valueOf(i + 1), label, error});
 					importDataError = true;
 					break;
 				}