completed modifying error messages