Added even more error fallbacks