Fix bug: don't want to save NULL for falsy values