Don't silently ignore empty fields. Fixes #547