Fixed validation exception handling