diff --git a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py b/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
index 8b263bd0ab..9b41e7087d 100644
--- a/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
+++ b/cave/build/static/common/cave/etc/gfe/userPython/procedures/MakeHazard.py
@@ -224,8 +224,14 @@ class Procedure (SmartScript.SmartScript):
             hazardKey = selectedHazard
             
         defaultHazKey = ""
-        if len(defaultSegment) > 0 and defaultHazard is not None:
-            defaultHazKey = defaultHazard + ":" + defaultSegment
+        if defaultHazard is not None:
+            index = string.find(defaultHazard, " ")
+            if index != -1:
+                defaultHazard = defaultHazard[0:index]
+            defaultHazKey = defaultHazard
+            
+            if len(defaultSegment) > 0:
+                defaultHazKey += ":" + defaultSegment
 
         weName = self._hazUtils._makeTempWEName(hazardKey)