Improved handling of error/exception conditions.