Updating error handling
no comment