Fix typo in error handling, incorporate #verify_uniform_ownership