diff --git a/client/mysql.cc b/client/mysql.cc
index a237561d83d..4ab97f1b3cf 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -2593,6 +2593,8 @@ static void mysql_end_timer(ulong start_time,char *buff)
 static const char* construct_prompt()
 {
   //erase the old prompt
+  if (!mysql_get_host_info(&mysql))
+    return  processed_prompt.ptr();
   processed_prompt.free();
   //get the date struct
   time_t  lclock = time(NULL);