diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java b/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
index e8a9ef385f..828ca22ab2 100644
--- a/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java
@@ -699,6 +699,11 @@ public class BeanWrapperImpl extends AbstractPropertyAccessor implements BeanWra
 							new PropertyChangeEvent(this.rootObject, this.nestedPath + propertyName, oldValue, pv.getValue());
 					throw new TypeMismatchException(pce, requiredType, ex);
 				}
+				catch (IllegalStateException ex) {
+					PropertyChangeEvent pce =
+							new PropertyChangeEvent(this.rootObject, this.nestedPath + propertyName, oldValue, pv.getValue());
+					throw new ConversionNotSupportedException(pce, requiredType, ex);
+				}
 				catch (IndexOutOfBoundsException ex) {
 					throw new InvalidPropertyException(getRootClass(), this.nestedPath + propertyName,
 							"Invalid array index in property path '" + propertyName + "'", ex);