Improve ErrNotFound errors