Prevent saving "empty" values, as suggested in #463