diff --git a/ChangeLog b/ChangeLog
index 983b650..9b3a98b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-02  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Frameworks/StepTalk/STRemoteConversation.m (connectionDidDie:):
+	Fix leak of the proxy and environmentProcess attributes when a
+	connection died.
+
 2014-11-01  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Frameworks/StepTalk/NSObject+additions.h (-notEqual:, -notSame:):
diff --git a/Frameworks/StepTalk/STRemoteConversation.m b/Frameworks/StepTalk/STRemoteConversation.m
index 47436a5..aa96989 100644
--- a/Frameworks/StepTalk/STRemoteConversation.m
+++ b/Frameworks/StepTalk/STRemoteConversation.m
@@ -79,7 +79,6 @@
     [connection invalidate];
     RELEASE(connection);
     connection = nil;
-    return;
 }
 
 - (void)dealloc
@@ -134,7 +133,9 @@
         NSLog(@"Closing conversation (%@) with %@", self, environmentName);
     }
 
+    RELEASE(proxy);
     proxy = nil;
+    RELEASE(environmentProcess);
     environmentProcess = nil;
     RELEASE(connection);
     connection = nil;