And one more exception type change