DDF-953 fixed unguarded write to variable