diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 145e2220d38..bb5ceba9253 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4786,7 +4786,7 @@ default_service_handling(char **argv,
 
   /* We have to quote filename if it contains spaces */
   pos= add_quoted_string(path_and_service, file_path, end);
-  if (*extra_opt)
+  if (extra_opt && *extra_opt)
   {
     /* 
      Add option after file_path. There will be zero or one extra option.  It's