Typo and minor exception tweaks for consistency

Should minor itch-scratching like this be done in the bleeding edge branch (4.3), or also in the upcoming release branch (4.2)?