[FOLD]

* Better error handling in signal handling