Added more error handling.
Fixed class names and references.
Added detection of partial matching to error handling.  All known exceptions should now be handled.