remove error classes forgotten during merge from bin_resolver
Merge branch 'cleanup-errors'