Improved EntityLoaderException handling