minor fix for possible npe