diff --git a/ChangeLog b/ChangeLog
index e08b8209..c602ba43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-25  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added error message when given address and resolved address do not
+	match in SocketCore::bind().
+	* src/SocketCore.cc
+
 2010-08-24  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added --bt-tracker and --bt-exclude-tracker option.  In
diff --git a/src/SocketCore.cc b/src/SocketCore.cc
index 220149eb..e46f57d4 100644
--- a/src/SocketCore.cc
+++ b/src/SocketCore.cc
@@ -282,7 +282,7 @@ void SocketCore::bind
         continue;
       }
       if(addrp && strcmp(host, addrp) != 0) {
-        // TODO we should assign something to error?
+        error = "Given address and resolved address do not match.";
         continue;
       }
       sock_t fd = bindTo(addrp, port, family, sockType_, flags, error);