@domcleal interesting. do you think it would be sufficient to add a similar rescue here?