Added a return value for NotFound