diff --git a/src/Preprocessor.php b/src/Preprocessor.php
index 2d311e00..9e0d5d11 100644
--- a/src/Preprocessor.php
+++ b/src/Preprocessor.php
@@ -321,6 +321,8 @@ class Preprocessor extends CompilerBase
                 case 'Stmt_Interface':
                     $this->parseInterface($v2);
                     break;
+                case 'Stmt_Nop':
+                    break;
                 default:
                     $this->foundStrayCode($v2);
                     break;
diff --git a/src/Translator.php b/src/Translator.php
index 14916aec..402568ea 100644
--- a/src/Translator.php
+++ b/src/Translator.php
@@ -2514,6 +2514,8 @@ CODE;
                 case 'Stmt_Interface':
                     $this->validateInterfaceOverrideAttributes($v2);
                     break;
+                case 'Stmt_Nop':
+                    break;
                 default:
                     abort($v2);
                     break;
diff --git a/tests/compiler/namespace/namespace-ending-comment.phpt b/tests/compiler/namespace/namespace-ending-comment.phpt
new file mode 100644
index 00000000..fa0f3da0
--- /dev/null
+++ b/tests/compiler/namespace/namespace-ending-comment.phpt
@@ -0,0 +1,22 @@
+--TEST--
+A namespace block ending with a comment must not be treated as stray code
+--FILE--
+<?php
+
+declare(strict_types=1);
+
+namespace Test {
+    // test
+}
+
+namespace {
+    function main()
+    {
+        var_dump('done');
+    }
+
+    // test1
+}
+?>
+--EXPECT--
+string(4) "done"