Even better error handling.