Includes additional error handlers.

Co-authored-by: Tamás Gálffy <ezittgtx@gmail.com>