diff --git a/spring-binding/src/main/java/org/springframework/binding/format/registry/GenericFormatterRegistry.java b/spring-binding/src/main/java/org/springframework/binding/format/registry/GenericFormatterRegistry.java
index 707ed4a8..9c789778 100644
--- a/spring-binding/src/main/java/org/springframework/binding/format/registry/GenericFormatterRegistry.java
+++ b/spring-binding/src/main/java/org/springframework/binding/format/registry/GenericFormatterRegistry.java
@@ -50,6 +50,9 @@ public class GenericFormatterRegistry implements FormatterRegistry {
 	// impl
 
 	public void registerFormatter(Formatter formatter) {
+		Assert.notNull(clazz, "The class the formatter formats is required");
+		Assert.isTrue(!clazz.isPrimitive(),
+				"Registering Formatters of primitive classes not allowed: register wrapper Object classes instead");
 		Assert.notNull(formatter, "The formatter to register is required");
 		formattersByClass.put(formatter.getObjectType(), formatter);
 	}