Added conditional check fixes for ev.source check