make get_prep_value support null values
Merge branch 'empty-values'