fixed issue #37, 处理下null值和空值