Extra rescue to help with uptime