diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc
index 52f8e2b10e3..b47e43afd76 100644
--- a/gcc/rust/expand/rust-macro-expand.cc
+++ b/gcc/rust/expand/rust-macro-expand.cc
@@ -962,12 +962,10 @@ transcribe_expression (Parser<MacroInvocLexer> &parser)
 
   auto attrs = parser.parse_outer_attributes ();
   auto expr = parser.parse_expr (std::move (attrs));
-  if (expr == nullptr)
-    {
-      for (auto error : parser.get_errors ())
-	error.emit ();
-      return AST::Fragment::create_error ();
-    }
+  for (auto error : parser.get_errors ())
+    error.emit ();
+  if (!expr)
+    return AST::Fragment::create_error ();
 
   // FIXME: make this an error for some edititons
   if (parser.peek_current_token ()->get_id () == SEMICOLON)
@@ -997,6 +995,8 @@ transcribe_type (Parser<MacroInvocLexer> &parser)
   auto type = parser.parse_type (true);
   for (auto err : parser.get_errors ())
     err.emit ();
+  if (!type)
+    return AST::Fragment::create_error ();
 
   auto end = lexer.get_offs ();
 
@@ -1018,6 +1018,9 @@ transcribe_pattern (Parser<MacroInvocLexer> &parser)
   for (auto err : parser.get_errors ())
     err.emit ();
 
+  if (!pattern)
+    return AST::Fragment::create_error ();
+
   auto end = lexer.get_offs ();
 
   return AST::Fragment ({std::move (pattern)},
diff --git a/gcc/testsuite/rust/compile/issue-4140-1.rs b/gcc/testsuite/rust/compile/issue-4140-1.rs
new file mode 100644
index 00000000000..8b68b3e2d8b
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-4140-1.rs
@@ -0,0 +1,18 @@
+pub enum TypeCtor {
+    Slice,
+    Array,
+}
+pub struct B<T>(T);
+
+macro_rules! ty_app {
+    ($_a:pat) => {
+        ApplicationTy($ctor) // { dg-error "unexpected token" }
+        // { dg-error "failed to parse tuple struct items" "" { target *-*-* } .-1 }
+    };
+}
+
+pub fn foo(ty: ApplicationTy) { // { dg-error "could not resolve type path 'ApplicationTy'" }
+    match ty {
+        ty_app!(bean::Array) => {}
+    }
+}
diff --git a/gcc/testsuite/rust/compile/issue-4140-2.rs b/gcc/testsuite/rust/compile/issue-4140-2.rs
new file mode 100644
index 00000000000..bcccddb3329
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-4140-2.rs
@@ -0,0 +1,12 @@
+macro_rules! ty_app {
+    ($_a:pat) => {
+        ($ctor)
+    };
+}
+
+pub fn foo() {
+    match ty {
+        // { dg-error "Cannot find path" "4140" { target *-*-* } 0 }
+        ty_app!(bean::Array) => {} // { dg-error "unrecognised token" "4140" { target *-*-* } 0 }
+    }
+}