Fix #1 Failsafe from API calls failing