Added EntityNotFound exception