diff --git a/core/lib/Drupal/Core/Extension/ModuleHandler.php b/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 8d43a857dd4c7a678ad190456b2ed14dcfe0b74e..d62398879c4dd3b91ec0fe659bba1012b7a30622 100644
--- a/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -777,7 +777,12 @@ public function getModuleDirectories() {
    * {@inheritdoc}
    */
   public function getName($module) {
-    return \Drupal::service('extension.list.module')->getName($module);
+    try {
+      return \Drupal::service('extension.list.module')->getName($module);
+    }
+    catch (UnknownExtensionException $e) {
+      return $module;
+    }
   }
 
 }
diff --git a/core/tests/Drupal/KernelTests/Core/Extension/ModuleHandlerTest.php b/core/tests/Drupal/KernelTests/Core/Extension/ModuleHandlerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..a826706daf65375522a334b60f9796297cd0e406
--- /dev/null
+++ b/core/tests/Drupal/KernelTests/Core/Extension/ModuleHandlerTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\KernelTests\Core\Extension;
+
+use Drupal\KernelTests\KernelTestBase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Extension\ModuleHandler
+ *
+ * @group Extension
+ */
+class ModuleHandlerTest extends KernelTestBase {
+
+  /**
+   * Tests requesting the name of an invalid module.
+   *
+   * @covers ::getName
+   */
+  public function testInvalidGetName() {
+    $module_handler = $this->container->get('module_handler');
+    $this->assertSame('module_nonsense', $module_handler->getName('module_nonsense'));
+  }
+
+}