fix for base exception handling