diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp
index 1d773ee..7ab0bb0 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp
@@ -56,7 +56,10 @@
     TD->getPointerSize() : -TD->getPointerSize();
 
   // Begin eh frame section.
-  Asm->SwitchToSection(Asm->getObjFileLowering().getEHFrameSection());
+  // FIXME: THIS IS A HORRIBLE HACK.  MingW isn't specifying an EHFrame section.
+  if (const MCSection *EHFrameSec = 
+      Asm->getObjFileLowering().getEHFrameSection())
+    Asm->SwitchToSection(EHFrameSec);
 
   if (TAI->is_EHSymbolPrivate())
     O << TAI->getPrivateGlobalPrefix();
@@ -150,8 +153,11 @@
 
   const Function *TheFunc = EHFrameInfo.function;
   
-  Asm->SwitchToSection(Asm->getObjFileLowering().getEHFrameSection());
-
+  // FIXME: THIS IS A HORRIBLE HACK.  MingW isn't specifying an EHFrame section.
+  if (const MCSection *EHFrameSec = 
+      Asm->getObjFileLowering().getEHFrameSection())
+    Asm->SwitchToSection(EHFrameSec);
+  
   // Externally visible entry into the functions eh frame info. If the
   // corresponding function is static, this should not be externally visible.
   if (!TheFunc->hasLocalLinkage())