adjustments & fixes in exception handling