Merge branch 'better-chan-errors'