Extra logic if measurand not accepted

[drc38]

Potentially fixes #1099 #1096

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.63%. Comparing base (1035e6c) to head (cbd65db).
Report is 3 commits behind head on main.

❗ Current head cbd65db differs from pull request most recent head d8041dd. Consider uploading reports for the commit d8041dd to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1101      +/-   ##
==========================================
+ Coverage   90.57%   90.63%   +0.05%     
==========================================
  Files          10       10              
  Lines        1380     1388       +8     
  Branches      228      229       +1     
==========================================
+ Hits         1250     1258       +8     
  Misses         74       74              
  Partials       56       56              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[drc38]

@lbbrhzn appreciate if you merge this into main as it appears to fix the issues reported. Or if you approve and then I think I can do the merge if that's easier.