added NotFound exception handling