Fix empty handlers issue
Fix send queue issue