diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index b6b52cd..558c940 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -334,7 +334,7 @@
                              FD->isInline(), F, true);
   }
                              
-  if (!Features.Exceptions)
+  if (!Features.Exceptions && !Features.ObjCNonFragileABI)
     F->addFnAttr(llvm::Attribute::NoUnwind);  
 
   if (D->getAttr<AlwaysInlineAttr>())