#30 fix potential NPE