added no internet handler and removed deprecated call