Yep, a slightly modified version of this should be good (return when eventOpt is empty).