Add new event types, update error messages and cleanup the throwError method.