Fix a bug with null valuie