Tightened up "NO DATA"-handling logic