Normalise 'general entity X not defined and no default entity' errors