Fixed a problem and rescued an exception.