Ensure we are in a good state when executionCompleted is called