Fixed not found error handling