Added fix for event failure class null

Signed-off-by: john <john@johnVB>
Merge branch 'masterMaster' of https://john1122@github.com/Rialaado/Grupa4.git into masterMaster