pt-83594018: removed validation and more precise exceptions.