Fix NullReferenceException ith previous commit.