Revert "Fix rescue block"

This reverts commit 58cd361a44d1e2a12e9346fd85113610b85bcc26.
Revert "Quickfix borked message"

This reverts commit 6d6aed7b1d73c4d5b5fac0fbc8d2b7bb11518884.