Fix for SPC-972 Part II

Adding a Null Check during the normalization of the event before
persisting it, to avoid NPE because of a bad usage of the Event UI.
Merge remote-tracking branch 'origin/space/14.1' into develop