Avoid creating handler waiter until shutdown

Avoid creating handler waiter until shutdown #1998