Better error handling

- Error handling
- Constructor updates
- Docs?