fixed possible NULL access bug