Added missing try/catch mechanisms to resolveEntity callers.