- added logging
- more verbose error messages