Fixed additional exceptions.