Typo and minor exception tweaks for consistency