diff --git a/spring-binding/src/main/java/org/springframework/binding/format/impl/FormatterRegistryImpl.java b/spring-binding/src/main/java/org/springframework/binding/format/impl/FormatterRegistryImpl.java
index 5947980b..7bffa475 100644
--- a/spring-binding/src/main/java/org/springframework/binding/format/impl/FormatterRegistryImpl.java
+++ b/spring-binding/src/main/java/org/springframework/binding/format/impl/FormatterRegistryImpl.java
@@ -90,6 +90,7 @@ public class FormatterRegistryImpl implements FormatterRegistry {
 		if (factory != null) {
 			return factory;
 		} else {
+			// TODO - getSuperClass can return null
 			if (clazz.getSuperclass() != Object.class) {
 				return findFormatterFactory(clazz.getSuperclass());
 			} else {