+ fixes and improved error handling