Xarigami

Issue closed by Jo

Return to Error and exception improvements