XD-1539 avoid stacktrace on xd-container shutdown