smurf: More secure handling of bad values associated with BADDA samples

This fixes some more issues that caused data/quality incosnsistencies
when using simulated data.