diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp
index 2d9947530cae8..210109c76a4a9 100644
--- a/flang/lib/Lower/Bridge.cpp
+++ b/flang/lib/Lower/Bridge.cpp
@@ -4214,8 +4214,7 @@ class FirConverter : public Fortran::lower::AbstractConverter {
     mlir::Block &endBody = changeOp.getRegion().back();
     builder->setInsertionPointToEnd(&endBody);
     genEndChangeTeamStmt(*this, endTeamEval, *endTeamStmt);
-    mlir::Operation *terminator = endBody.getTerminator();
-    assert((terminator && mlir::isa<mif::EndTeamOp>(terminator)) &&
+    assert(mlir::isa_and_nonnull<mif::EndTeamOp>(endBody.getTerminator()) &&
            "missing end team terminator");
     builder->setInsertionPointAfter(changeOp.getOperation());