fix potential null