Added handling for AlreadyColsedException and fixed executor cleanup
(cherry picked from commit 9e3060dd3580d2e027d8c91e263efb29401b72bb)