Changes to show error messages