Deal with existing null values correctly

This was causing workflows to break in the expressions table for me as it would take a NULL value from the database and convert it to a "" on the import

Two separate commits in case you don't want the command line options.