Fixed validation exception and messaging