stop returning NOT_FOUND when an error occured