diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 93d475cbf7e..903f6a024f7 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -4732,9 +4732,9 @@ const char *get_errname_from_code (uint error_code)
        DBUG_RETURN(e->name);
      }
    }
-   die("Unknown SQL error code '%d'", error_code);
-}
-       
+   /* Apparently, errors without known names may occur */
+   DBUG_RETURN("<Unknown>");
+} 
 
 void do_get_errcodes(struct st_command *command)
 {