diff --git a/cde/programs/dtfile/FileDialog.c b/cde/programs/dtfile/FileDialog.c
index a3e472d07..743bfac0b 100644
--- a/cde/programs/dtfile/FileDialog.c
+++ b/cde/programs/dtfile/FileDialog.c
@@ -1953,7 +1953,7 @@ ShowMakeFileDialog(
 
    DialogCallbackStruct * call_struct;
    char * tmpStr = NULL, *tempStr = NULL;
-   XmString label_string;
+   XmString label_string = NULL;
 
    Arg args[20];
    int n;
@@ -2044,6 +2044,14 @@ ShowMakeFileDialog(
    }
    XtFree(tempStr);
 
+   if (!shell)
+   {
+       /* shouldn't happen, but... */
+       if (label_string)
+           XmStringFree(label_string);
+       return;
+   }
+
    /* Set the useAsyncGeo on the shell */
    XtSetArg (args[0], XmNuseAsyncGeometry, True);
    XtSetValues (XtParent(shell), args, 1);