Better handling of failures.