Index: /java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/gui/MainWin.java
===================================================================
--- /java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/gui/MainWin.java	(revision 852)
+++ /java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/gui/MainWin.java	(revision 853)
@@ -110,4 +110,5 @@
 
 	class Updater extends SwingWorker<Status, Status> {
+		boolean uptodate = false;
 
 		@Override
@@ -136,13 +137,30 @@
 				int x = svn.checkSVN("http://svn.aei.oni2.net",
 						new File(Paths.getPrefsPath(), "bin"));
-				if (x != 0) {
-					// Update available, missing files or no WC yet
-					svn.updateWC("http://svn.aei.oni2.net",
-							new File(Paths.getPrefsPath(), "bin"),
-							new SVNUpdateListener() {
-								public void statusUpdate(int done, int total) {
-									publish(new Status(done, total));
-								}
-							});
+				switch (x) {
+					case -2: // No repos connection
+						break;
+					case 0: // Repos up to date
+						uptodate = true;
+						break;
+					case -1:// no WC yet
+					case 1:// Update available
+					case 2:// missing files
+						uptodate = svn.updateWC("http://svn.aei.oni2.net",
+								new File(Paths.getPrefsPath(), "bin"),
+								new SVNUpdateListener() {
+									public void statusUpdate(int done, int total) {
+										publish(new Status(done, total));
+									}
+								});
+						break;
+				}
+				if (!uptodate) {
+					JOptionPane
+							.showMessageDialog(
+									null,
+									"Perhaps you don't have a internet connection right now or\nyou have (not) entered (wrong) proxy data?",
+									"Updating AEI failed!",
+									JOptionPane.ERROR_MESSAGE);
+					System.exit(1);
 				}
 			} catch (Exception e) {
@@ -179,8 +197,10 @@
 		protected void done() {
 			super.done();
-			step.setText("AEI is up to date");
-			bar.setValue(1);
-			bar.setMaximum(1);
-			closeBtn.setEnabled(true);
+			if (uptodate) {
+				step.setText("AEI is up to date");
+				bar.setValue(1);
+				bar.setMaximum(1);
+				closeBtn.setEnabled(true);
+			}
 		}
 	}