Remove the pusher before DeathErroring
Merge branch 'think-green-tweaks-2'