Error capture on attach in case no internet connection is available
Merge branch 'master' into stable
Minor change on attach