2 files changed, 21 insertions, 12 deletions

diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
index 112487f..8c933e1 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
@@ -11,18 +11,23 @@ namespace OpenGridServices.Manager
                 
                 public bool Connect(string GridServerURL, string username, string password)
                 {
-                        this.ServerURL=GridServerURL;
-                        Hashtable LoginParamsHT = new Hashtable();
-                        LoginParamsHT["username"]=username;
-                        LoginParamsHT["password"]=password;
-                        ArrayList LoginParams = new ArrayList();
-                        LoginParams.Add(LoginParamsHT);
-                        XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
-                        XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
-                        if(GridResp.IsFault) {
+                        try {
+                                this.ServerURL=GridServerURL;
+                                Hashtable LoginParamsHT = new Hashtable();
+                                LoginParamsHT["username"]=username;
+                                LoginParamsHT["password"]=password;
+                                ArrayList LoginParams = new ArrayList();
+                                LoginParams.Add(LoginParamsHT);
+                                XmlRpcRequest GridLoginReq = new XmlRpcRequest("manager_login",LoginParams);
+                                XmlRpcResponse GridResp = GridLoginReq.Send(ServerURL,3000);
+                                if(GridResp.IsFault) {
+                                        return false;
+                                } else {
+                                        return true;
+                                }
+                        } catch(Exception e) {
+                                Console.WriteLine(e.ToString());
                                 return false;
-                        } else {
-                                return true;
                         }
                 }
         }
diff --git a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs b/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
index b14d10b..0e3f74d 100644
--- a/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenGridServices.Manager/OpenGridServices.Manager/Main.cs
@@ -39,7 +39,11 @@ namespace OpenGridServices.Manager
                                 switch(cmd) {
                                         case "connect_to_gridserver":
                                                 win.SetStatus("Connecting to grid server...");                                          
-                                                gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3]);
+                                                if(gridserverConn.Connect(operation.Split(sep)[1],operation.Split(sep)[2],operation.Split(sep)[3])) {
+                                                        win.SetStatus("Connected OK");
+                                                } else {
+                                                        win.SetStatus("Could not connect");
+                                                }
                                         break;
                                 }
                         }