Adds handling of connection issues to build process