fix potential NPE (I wouldn't think it would ever be null anymore but I guess it can be?)