diff --git a/llvm/lib/IR/BasicBlock.cpp b/llvm/lib/IR/BasicBlock.cpp
index c632b1b2dc2ab..f870fb53307ea 100644
--- a/llvm/lib/IR/BasicBlock.cpp
+++ b/llvm/lib/IR/BasicBlock.cpp
@@ -455,7 +455,7 @@ BasicBlock::const_iterator BasicBlock::getFirstNonPHIOrDbgOrAlloca() const {
   if (InsertPt == end())
     return end();
 
-  if (InsertPt->isEHPad())
+  if (InsertPt->isEHPad() && !InsertPt->isTerminator())
     ++InsertPt;
 
   if (isEntryBlock()) {