Issue #1: Fixing problem with null values.