Add handling of exceptions that appeared in real use.