Merge "EventLog: Check for exception after add()"