bettor error handling
Merge branch 'error_handling'

* error_handling:
  bettor error handling