Updated error/warning messages