diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 5c2765b9168..c078f23c20e 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -4492,14 +4492,13 @@ LowerArguments(BasicBlock *LLVMBB, SelectionDAGLowering &SDL,
 
 static void copyCatchInfo(BasicBlock *SrcBB, BasicBlock *DestBB,
                           MachineModuleInfo *MMI, FunctionLoweringInfo &FLI) {
-  assert(!FLI.MBBMap[SrcBB]->isLandingPad() &&
-         "Copying catch info out of a landing pad!");
   for (BasicBlock::iterator I = SrcBB->begin(), E = --SrcBB->end(); I != E; ++I)
     if (isSelector(I)) {
       // Apply the catch info to DestBB.
       addCatchInfo(cast<CallInst>(*I), MMI, FLI.MBBMap[DestBB]);
 #ifndef NDEBUG
-      FLI.CatchInfoFound.insert(I);
+      if (!FLI.MBBMap[SrcBB]->isLandingPad())
+        FLI.CatchInfoFound.insert(I);
 #endif
     }
 }