Add saving state and error fallback