Merge "Chaos: make hangup NULL tolerant"