Better handling of transforms and transform errors