Andrew "Amended error msgs"