Updated thrown messages