Added Exception handlin for Network state & pushed changes by Mayumi to main line