Changed None to be notFound