Removed comment and fixed exception messages