Bug Fixes

Exceptions should not be raised in this code. It has its own error
reporting system that works.