Small Bug Fixes

After BW came home he brought some data from the customer. Some small
changes were done. Exception handling imporved.