Added handling for AlreadyColsedException and fixed executor cleanup