Don't overwrite null values

Fixes #17