add some null-tolerance