added error fallback