Another fix on exception handling.