r2836 Added EntityNotFoundException to spotEntity()