diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index 961b6f6b15..44e3634d21 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -420,7 +420,15 @@ public class UpdateCenter extends AbstractModelObject {
public void run() {
try {
statuses.add(Messages.UpdateCenter_Status_CheckingInternet());
- testConnection(new URL("http://www.google.com/"));
+ try {
+ testConnection(new URL("http://www.google.com/"));
+ } catch (IOException e) {
+ if(e.getMessage().contains("Connection timed out")) {
+ // Google can't be down, so this is probably a proxy issue
+ statuses.add(Messages.UpdateCenter_Status_ConnectionFailed("www.google.com"));
+ return;
+ }
+ }
statuses.add(Messages.UpdateCenter_Status_CheckingJavaNet());
testConnection(new URL("https://hudson.dev.java.net/?uctest"));
diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties
index c96d5d9fe5..74cc7f47c3 100644
--- a/core/src/main/resources/hudson/model/Messages.properties
+++ b/core/src/main/resources/hudson/model/Messages.properties
@@ -120,6 +120,9 @@ UpdateCenter.Status.Success=Success
UpdateCenter.Status.UnknownHostException=\
Failed to resolve host name {0}. \
Perhaps you need to configure HTTP proxy?
+UpdateCenter.Status.ConnectionFailed=\
+ Failed to connect to {0}. \
+ Perhaps you need to configure HTTP proxy?
Permalink.LastBuild=Last build
Permalink.LastStableBuild=Last stable build