code cosmetics

- update header includes
- bugfix catch blocks