diff --git a/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultDateParameterMapMapper.java b/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultDateParameterMapMapper.java
index ba3ab4f..06980bd 100644
--- a/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultDateParameterMapMapper.java
+++ b/framework/src/main/java/de/hsadmin/module/property/mapping/DefaultDateParameterMapMapper.java
@@ -27,11 +27,14 @@ public class DefaultDateParameterMapMapper implements ParameterMapMapper<Date> {
 		if (value instanceof Date) {
 			return (Date) value;
 		}
-		if (value instanceof String && ((String) value).trim().length() == 0) {
-			try {
-				return DateUtil.DEFAULT_DATEFORMAT.parse((String) value);
-			} catch (ParseException e) {
-				throw new UserException(new UserError(UserError.MSG_INVALID_DATEFORMAT, propertyName, (String) value));
+		if (value instanceof String) {
+			final String valueAsString = ((String) value).trim();
+			if (valueAsString.length() > 0) {
+				try {
+					return DateUtil.DEFAULT_DATEFORMAT.parse(valueAsString);
+				} catch (ParseException e) {
+					throw new UserException(new UserError(UserError.MSG_INVALID_DATEFORMAT, propertyName, valueAsString));
+				}
 			}
 		}
 		return null;