*8521* Fixed error reporting, using exceptions