Revert "disable error handling for the moment"

This reverts commit 0e93d4c04f0d5c5e51a8e7e80e14afea46b0ec4b.