From e38111072d82d51d279fce5b2b53a74c974b08ab Mon Sep 17 00:00:00 2001
From: BetaSteward <betasteward@gmail>
Date: Wed, 25 May 2011 00:17:00 -0400
Subject: [PATCH] fixed some annoying client errors

---
 .../main/java/mage/client/remote/Session.java | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/remote/Session.java b/Mage.Client/src/main/java/mage/client/remote/Session.java
index 0739bab49ae..aa5683f8fe9 100644
--- a/Mage.Client/src/main/java/mage/client/remote/Session.java
+++ b/Mage.Client/src/main/java/mage/client/remote/Session.java
@@ -143,23 +143,19 @@ public class Session {
 			reconnecting = false;
 			connecting = false;
 			return true;
-		} catch (MageException ex) {
+		} catch (Exception ex) {
 			logger.fatal("", ex);
 			if (!reconnecting) {
 				disconnect(false);
 				JOptionPane.showMessageDialog(frame, "Unable to connect to server. "  + ex.getMessage());
 			}
-		} catch (RemoteException ex) {
-			logger.fatal("Unable to connect to server - ", ex);
-			if (!reconnecting) {
-				disconnect(false);
-				JOptionPane.showMessageDialog(frame, "Unable to connect to server. "  + ex.getMessage());
-			}
 		}
 		return false;
 	}
 	
 	public synchronized void disconnect(boolean voluntary) {
+		if (connection == null)
+			return;
 		if (reconnecting)
 			return;
 		if (future != null && !future.isDone())
@@ -215,14 +211,9 @@ public class Session {
 	}
 
 
-	private UUID registerClient(String userName, UUID clientId, MageVersion version) throws MageException {
+	private UUID registerClient(String userName, UUID clientId, MageVersion version) throws MageException, ServerUnavailable {
 		RegisterClient method = new RegisterClient(connection, userName, clientId, version);
-		try {
-			return method.makeCall();
-		} catch (ServerUnavailable ex) {
-			logger.fatal("server unavailable - ", ex);
-		}
-		return null;
+		return method.makeCall();
 	}
 
 	private void deregisterClient() throws MageException {