Refactored ContinueWithNotComplete to be more like Then