1 files changed, 6 insertions, 0 deletions
diff --git a/cli/src/cli.c b/cli/src/cli.c
index e4e7444e8aa..7341c7e8f4f 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -352,6 +352,12 @@ cli_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
         {
                 gf_log (this->name, GF_LOG_TRACE, "got RPC_CLNT_DISCONNECT");
                 connected = 0;
+                if (!global_state->prompt && global_state->await_connected) {
+                        ret = 1;
+                        cli_out ("Connection failed. Please check if gluster "
+                                  "daemon is operational.");
+                        exit (ret);
+                }
                 break;
         }