The tiny update

* Re-enabled error handling
* Small bug fix