handle NotFoundExceptions gracefully