Revert "Improved error handling"

This reverts commit 633944c8b26485b6ccac59ed6dce3fb9c3205048.