Prevent further output after error condition
Merge branch 'mbst-4961-junk-characters-on-channels-endpoint' into stage