Propagated leftover changes from v1.6.x
Added back die message