Now handling of exceptions is better.