Unity fixes

Same thing - need to handle null val.