Story 46610125: handling validation better