No need to type option in pattern match
Fix NPE when __EVENTVALIDATION not set on fiks