2 files changed, 3 insertions, 1 deletions
diff --git a/TODO b/TODO
index 42a456dfe..aaa86e5a5 100644
--- a/TODO
+++ b/TODO
@@ -15,6 +15,7 @@
 *) state
 	*) abstract out state code from playlist.c
 	*) save states of audioOutput devices
+	*) put MPD Version in statefile
 
 *) put more debugging info when failing to read/write db and other similar 
 	errors
diff --git a/src/listen.c b/src/listen.c
index cac9492b8..7446f2e91 100644
--- a/src/listen.c
+++ b/src/listen.c
@@ -151,7 +151,8 @@ static int establishListen(unsigned int port, ConfigParam * param) {
 	}
 
 	if(bind(sock,addrp,addrlen)<0) {
-		ERROR("unable to bind port %i: %s\n", port, strerror(errno));
+		ERROR("unable to bind port %i (for address at line %i): %s\n", 
+				port, param->line, strerror(errno));
 		ERROR("maybe MPD is still running?\n");
 		exit(EXIT_FAILURE);
 	}