Don't set model value to null when empty string

Fixes #33