diff --git a/spring-binding/src/main/java/org/springframework/binding/format/formatters/DateFormatter.java b/spring-binding/src/main/java/org/springframework/binding/format/formatters/DateFormatter.java
index 63fbcf3e..62aba8ec 100644
--- a/spring-binding/src/main/java/org/springframework/binding/format/formatters/DateFormatter.java
+++ b/spring-binding/src/main/java/org/springframework/binding/format/formatters/DateFormatter.java
@@ -69,19 +69,15 @@ public class DateFormatter implements Formatter {
 	}
 
 	protected DateFormat getDateFormat() {
-		if (pattern != null) {
-			if (locale != null) {
-				return new SimpleDateFormat(pattern, locale);
-			} else {
-				return new SimpleDateFormat(pattern);
-			}
-		} else {
-			if (locale != null) {
-				return new SimpleDateFormat(DEFAULT_PATTERN, locale);
-			} else {
-				return new SimpleDateFormat(DEFAULT_PATTERN);
-			}
+		String pattern = this.pattern;
+		if (pattern == null) {
+			pattern = DEFAULT_PATTERN;
 		}
+		Locale locale = this.locale;
+		if (locale == null) {
+			locale = Locale.getDefault();
+		}
+		return new SimpleDateFormat(pattern, locale);
 	}
 
 }
\ No newline at end of file
diff --git a/spring-binding/src/main/java/org/springframework/binding/format/formatters/NumberFormatter.java b/spring-binding/src/main/java/org/springframework/binding/format/formatters/NumberFormatter.java
index aca00bfe..0dac00bc 100644
--- a/spring-binding/src/main/java/org/springframework/binding/format/formatters/NumberFormatter.java
+++ b/spring-binding/src/main/java/org/springframework/binding/format/formatters/NumberFormatter.java
@@ -24,17 +24,31 @@ import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
 
+/**
+ * A formatter for the common number types such as integers, and big decimals.
+ * 
+ * @author Keith Donald
+ */
 public class NumberFormatter implements Formatter {
 
 	private String pattern;
 
 	private Class numberClass;
 
+	/**
+	 * Creates a number formatter for the specified number type.
+	 * @param numberClass the number type, a class extending from {@link Number}.
+	 */
 	public NumberFormatter(Class numberClass) {
 		Assert.notNull(numberClass, "The number class is required");
 		this.numberClass = numberClass;
 	}
 
+	/**
+	 * Sets the pattern for formatting numbers.
+	 * @param pattern the format pattern
+	 * @see DecimalFormat
+	 */
 	public void setPattern(String pattern) {
 		this.pattern = pattern;
 	}
@@ -55,9 +69,17 @@ public class NumberFormatter implements Formatter {
 			return null;
 		}
 		if (pattern != null) {
-			return NumberUtils.parseNumber(formattedString, numberClass, getNumberFormat());
+			try {
+				return NumberUtils.parseNumber(formattedString, numberClass, getNumberFormat());
+			} catch (IllegalArgumentException e) {
+				throw new InvalidFormatException(formattedString, pattern, e);
+			}
 		} else {
-			return NumberUtils.parseNumber(formattedString, numberClass);
+			try {
+				return NumberUtils.parseNumber(formattedString, numberClass);
+			} catch (NumberFormatException e) {
+				throw new InvalidFormatException(formattedString, "A " + numberClass.getName(), e);
+			}
 		}
 	}