Executor: handle missing commands in a more backwards-compatible way