Minor changes in exception reporting.
Minor bugfixes.