merge  vcliment89:patch-1 Fix NULL values