Fix Exception Resolution