diff --git a/wst/trunk/ws_helper/xsd_parser.pas b/wst/trunk/ws_helper/xsd_parser.pas
index 397c029bc..65a13649b 100644
--- a/wst/trunk/ws_helper/xsd_parser.pas
+++ b/wst/trunk/ws_helper/xsd_parser.pas
@@ -1020,7 +1020,8 @@ begin
     locName := ExtractIdentifier(AModuleName);
     if not IsStrEmpty(locName) then begin
       FModuleName := locName;
-      Module.Name := FModuleName;
+      if (Module <> nil) then
+        Module.Name := FModuleName;
     end;
   end;
 end;