SP Not found error handling fixed