Modified catches and error handlers