Quick fix for overly broad rescue