I see, you treat this here ... was misleading. I guess you could just remove the check for null.