Rescue more errors
Merge pull request #1 from cef/rescue_more_errors

Rescue more errors