Updated throw messages and comments