Improve error handling for user-created Policies