- Fixed error fallback logic