Add space after comma
Tweak exception message text