Merge "Clean up property set error handling"