fixed two rare npe