More authentication and error handling.