Bug Fix: Final fix for NullPointerException when there is no Internet Connection.