Fixed validation exceptions