Fixing error messages!