Fixed patch
Replaced patching exception-reporting use our fork