[cherry-pick] fix error detection during trigger removal#12

aap-sc merged 1 commit intosyntacoresyntacore/openocd:syntacorefrom

aap-sc/rwp_fixupsyntacore/openocd:aap-sc/rwp_fixupCopy head branch name to clipboard