Protect wider connection errors
Merge branch 'master' into production