diff --git a/src/main/java/org/springframework/classify/SubclassClassifier.java b/src/main/java/org/springframework/classify/SubclassClassifier.java
index b470a17..7156bb1 100644
--- a/src/main/java/org/springframework/classify/SubclassClassifier.java
+++ b/src/main/java/org/springframework/classify/SubclassClassifier.java
@@ -114,15 +114,15 @@ public class SubclassClassifier<T, C> implements Classifier<T, C> {
 			value = classified.get(cls);
 		}
 
-		if (value == null) {
-			value = defaultValue;
-		}
-
 		//ConcurrentHashMap doesn't allow nulls
 		if (value != null) {
 			this.classified.put(exceptionClass, value);
 		}
 
+		if (value == null) {
+			value = defaultValue;
+		}
+
 		return value;
 	}