Some duplicate and null checking when assigning EmcValues
Merge remote-tracking branch 'upstream/master' into Fluids