new handling of exceptions