Re #7990 catch more error conditions