Differentiate null values from empty strings

Fixes #4