Fixed #1262
Added `die.message` hook, closed #1259
Fixed #1246