Revert "More sprucing for the error handler"

This reverts commit 0cfd663738fd6d81c50edf6f380e9b8c571f71e5.