ATLAS-134 Some defects found when reviewing the source code (ltfxyz via shwethags) - added missing code part
