Added some soft failing in the case of no connectivity