Resolve #2021 "05 17 branched from master sdp hotfix"

fixes unhandled exception for the time being

Merge request reports

Loading