Merge branch 'pb/error'