Fix uninitialized ivar warning
Refactor runner short-circuit code