Enhancement to avoid lazy loading exceptions