Fix some exceptions
Merge remote-tracking branch 'origin/dom-agent-exceptions' into merged-fixes