#3256 Minor check for null values