Revert "NEW Error handling"

This reverts commit 1c37ea19a0cb1ea058a535a5eecc818e36d78aa3.