fixed handling of domain exceptions