- Improved the error-handling.
- Minor cleanups.