diff --git a/System.c b/System.c
index 2ff820ef547e065acb8429c6049a4ae9a728c142..22083618c93a54432395ba1d7a27acd7204f5225 100644
--- a/System.c
+++ b/System.c
@@ -170,6 +170,12 @@ flag later when we understand applications of this better.
 static int kwsysSystem_Shell__ArgumentNeedsQuotes(const char* in, int isUnix,
                                                   int flags)
 {
+  /* The empty string needs quotes.  */
+  if(!*in)
+    {
+    return 1;
+    }
+
   /* Scan the string for characters that require quoting.  */
   {
   const char* c;