Exception handling improved.