Guarded assignments should override null values
Merge pull request #766 from xzyfer/fix/guarded-assigments-override-null

Guarded assignments should override null values