--- a/src/ch/ethz/ssh2/channel/ChannelManager.java	Fri Jul 18 19:59:32 2014 -0700
+++ b/src/ch/ethz/ssh2/channel/ChannelManager.java	Fri Jul 18 20:17:53 2014 -0700
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 
+import ch.ethz.ssh2.AuthAgentCallback;
 import ch.ethz.ssh2.ChannelCondition;
 import ch.ethz.ssh2.PacketFormatException;
 import ch.ethz.ssh2.PacketTypeException;
@@ -466,7 +467,7 @@
      * @param agent
      * @throws IOException
      */
-    public boolean requestChannelAgentForwarding(Channel c, AuthAgentCallback authAgent) throws IOException {
+    public void requestChannelAgentForwarding(Channel c, AuthAgentCallback authAgent) throws IOException {
         synchronized (this) {
             if (this.authAgent != null)
                 throw new IllegalStateException("Auth agent already exists");
@@ -481,9 +482,17 @@
         log.debug("Requesting agent forwarding");
 
         PacketChannelAuthAgentReq aar = new PacketChannelAuthAgentReq(c.remoteID);
-        tm.sendMessage(aar.getPayload());
+        synchronized(c.channelSendLock) {
+            if (c.closeMessageSent) {
+                throw c.getReasonClosed();
+            }
+            tm.sendMessage(aar.getPayload());
+        }
 
-        if (waitForChannelRequestResult(c) == false) {
+        try {
+            waitForChannelSuccessOrFailure(c);
+        }
+        catch(IOException e) {
             authAgent = null;
             return false;
         }