fix noNetwork crash
merge fix