Fixing error messages (shared partial).