some small fixes and additional exception handling picked up during the live tests