[13] Converted class errorHandler to more generic eventHandler.

Minor cleanups.