Fix refactoring bug

Setting the executor service to null and access it directly afterwards
does not make much sense ...