diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
index 20a116c6a..38e624e06 100644
--- a/lib/checkcondition.cpp
+++ b/lib/checkcondition.cpp
@@ -620,12 +620,15 @@ void CheckCondition::multiCondition2()
                     if (!Token::simpleMatch(tok->linkAt(1), "} while ("))
                         break;
                     tok2 = tok->linkAt(1)->linkAt(2);
-                } else {
+                } else if (Token::Match(tok, "if|while (")) {
                     tok2 = tok->linkAt(1);
                     if (Token::simpleMatch(tok2, ") {"))
                         tok2 = tok2->linkAt(1);
                     if (!tok2)
                         break;
+                } else {
+                    // Incomplete code
+                    break;
                 }
                 bool changed = false;
                 for (std::set<unsigned int>::const_iterator it = vars.begin(); it != vars.end(); ++it) {
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
index 28d80e7f1..842798b6e 100644
--- a/test/testcondition.cpp
+++ b/test/testcondition.cpp
@@ -1808,6 +1808,13 @@ private:
               "}");
         ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:4]: (warning) Identical condition 'x>100', second condition is always false\n", errout.str());
 
+        check("void f(int x) {\n"  // #8217 - crash for incomplete code
+              "  if (x > 100) { return; }\n"
+              "  X(do);\n"
+              "  if (x > 100) {}\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
         check("void f(const int *i) {\n"
               "  if (!i) return;\n"
               "  if (!num1tok) { *num1 = *num2; }\n"