adjustments to exception handling