Added Not Found Exception to tidy up code