diff --git a/llvm/lib/Transforms/Scalar/SCCP.cpp b/llvm/lib/Transforms/Scalar/SCCP.cpp
index 954bc0011e6f..dfb47954591e 100644
--- a/llvm/lib/Transforms/Scalar/SCCP.cpp
+++ b/llvm/lib/Transforms/Scalar/SCCP.cpp
@@ -1749,8 +1749,7 @@ bool IPSCCP::runOnModule(Module &M) {
       } else {
         for (BasicBlock::iterator BI = BB->begin(), E = BB->end(); BI != E; ) {
           Instruction *Inst = BI++;
-          if (Inst->getType() == Type::VoidTy ||
-              isa<TerminatorInst>(Inst))
+          if (Inst->getType() == Type::VoidTy)
             continue;
           
           LatticeVal &IV = Values[Inst];
@@ -1766,7 +1765,7 @@ bool IPSCCP::runOnModule(Module &M) {
           Inst->replaceAllUsesWith(Const);
           
           // Delete the instruction.
-          if (!isa<CallInst>(Inst))
+          if (!isa<CallInst>(Inst) && !isa<TerminatorInst>(Inst))
             Inst->eraseFromParent();
 
           // Hey, we just changed something!
diff --git a/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll b/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
new file mode 100644
index 000000000000..20f7c21b7c18
--- /dev/null
+++ b/llvm/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
@@ -0,0 +1,28 @@
+; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep {ret i32 42}
+; RUN: llvm-as < %s | opt -ipsccp | llvm-dis | grep {ret i32 undef}
+; PR3325
+
+define i32 @main() {
+	%tmp1 = invoke i32 @f()
+			to label %UnifiedReturnBlock unwind label %lpad
+
+lpad:
+	unreachable
+
+UnifiedReturnBlock:
+	ret i32 %tmp1
+}
+
+define internal i32 @f() {
+       ret i32 42
+}
+
+declare i8* @__cxa_begin_catch(i8*) nounwind
+
+declare i8* @llvm.eh.exception() nounwind
+
+declare i32 @llvm.eh.selector.i32(i8*, i8*, ...) nounwind
+
+declare void @__cxa_end_catch()
+
+declare i32 @__gxx_personality_v0(...)