Various Error Handling improvs
Updated tests