Some changes to exception messages...Making them more consistent