Update with proper NOENTS check (was checking NORECS instead)
Update with proper NOENTS check (was checking NORECS instead)

(cherry picked from commit 9df0d2e24784d92e4f5389ada8f7108f5ef0d5fd)

MarcNo/lifelines,MarcNo/lifelines,MarcNo/lifelines,MarcNo/lifelines