more exception simplification