Minor increase of err domain handling (needs more optimization)