bsim: fix some broken error reporting.
Merge branch 'bsim'