add some null checks, tag as v4