Initial work toward consistent exception handling.