Similar as in 1.9.x, but here the Executor may be null (threading
and pooling has been reworked) so we need to check for executor
being non-null.

self-assigned this

cstamas marked this pull request as ready for review