better error handling

- 3.1.10