Refactored Not found error