Better handling of success and failure.