Updating for better error handling.