am a7d5ca6b: Stop errors being logged erroneously on event predispatch

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