Preparing for improved error handling.