Fixed issue for devices without mobile connectivity.