Revert "fix to handle_error thanks to tim"

This reverts commit 3a3ea6ac2d9e782b2228fb82eca865f33cf18a1a.