Adding null checks to EventStore