fixed the bug caused by None and NULL