#2 fix potential NPE