Improve handling of soft kill of the TW. Fixes #4541