am 4f842f00: am a7d5ca6b: Stop errors being logged erroneously on event predispatch

* commit '4f842f0072b0dc271a93f848d080aa01fcca0643':
  Stop errors being logged erroneously on event predispatch