0
@@ -262,9 +262,13 @@ private:
0
       vector<string> args;
0
       int reader, writer;
0
       
0
-			channel.write("get", appRoot.c_str(),
0
-				(lowerPrivilege) ? "true" : "false",
0
-				lowestUser.c_str(), NULL);
0
+			try {
0
+				channel.write("get", appRoot.c_str(),
0
+					(lowerPrivilege) ? "true" : "false",
0
+					lowestUser.c_str(), NULL);
0
+			} catch (const SystemException &) {
0
+				throw IOException("The ApplicationPool server exited unexpectedly.");
0
+			}
0
       if (!channel.read(args)) {
0
         throw IOException("The ApplicationPool server unexpectedly closed the connection.");
0
       }
0
@@ -489,14 +493,22 @@ public:
0
    * @throws IOException Something went wrong.
0
    */
0
   ApplicationPoolPtr connect() {
0
-		MessageChannel channel(serverSocket);
0
-		int clientConnection;
0
+		try {
0
+			MessageChannel channel(serverSocket);
0
+			int clientConnection;
0
     
0
-		// Write some random data to wake up the server.
0
-		channel.writeRaw("x", 1);
0
+			// Write some random data to wake up the server.
0
+			channel.writeRaw("x", 1);
0
     
0
-		clientConnection = channel.readFileDescriptor();
0
-		return ptr(new Client(clientConnection));
0
+			clientConnection = channel.readFileDescriptor();
0
+			return ptr(new Client(clientConnection));
0
+		} catch (const SystemException &e) {
0
+			throw SystemException("Could not connect to the ApplicationPool server", e.code());
0
+		} catch (const IOException &e) {
0
+			string message("Could not connect to the ApplicationPool server: ");
0
+			message.append(e.what());
0
+			throw IOException(message);
0
+		}
0
   }
0
   
0
   /**