Move nil origin check out to execute