Force a check for network availability on curl error
Fix exception on curl error
Merge branch 'feature/network-issues' into develop