master: moved null check logic to _addListener function from on and once methods. Added more checks around eventName args to ensure it can only be a non empty object.