DAR-2525 Handle exception differently