Add test for possible problems with null or 0