Fix null override of falsey values