diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java
index 8b73c42119a..69809d2ae60 100644
--- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java
+++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/internal/model/cfg/ControlFlowGraphBuilder.java
@@ -84,7 +84,8 @@ public class ControlFlowGraphBuilder {
 			exits.add(returnExit);
 			for (IBasicBlock ds : dead) {
 				IBasicBlock dl = findLast(ds);
-				if (dl != null && dl.getOutgoingSize() == 0 && dl != returnExit) {
+				if (dl != null && !(dl instanceof IExitNode) && dl.getOutgoingSize() == 0 &&
+						dl != returnExit) {
 					((AbstractBasicBlock) dl).addOutgoing(returnExit);
 				}
 			}