2 files changed, 3 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0a4d91a7e75..f58c5d04b50 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -5,6 +5,7 @@
         WINDOWSNT.
         (print_help_and_exit): Replace EMACS_DAEMON with WINDOWSNT.
         (start_daemon_and_retry_set_socket): Likewise.
+        (main): Fail in case of not being able to connect.
 
 2008-12-10  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 7fbedbce141..56e8b5b9859 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1519,6 +1519,8 @@ main (argc, argv)
       }
     else
       fail ();
+  else
+    fail ();
 
   cwd = get_current_dir_name ();
   if (cwd == 0)