Error handling
Revert "Error handling"

This reverts commit aefcea0120fc3124cdcbcb15a8c02bdf32722f2c.
some shit?