diff --git a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
index 7fb48fa..eb5eeee 100644
--- a/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
@@ -267,8 +267,9 @@ protected function enforcePluginInterface($plugin_id, $plugin_definition) {
     elseif (is_string($this->interface) && is_subclass_of($plugin_definition['class'], $this->interface)) {
       return;
     }
-    throw new PluginException(String::format('Plugin @plugin_id in @provider should implement interface @interface', array(
+    throw new PluginException(String::format('Plugin "@plugin_id" (@class) in @provider should implement interface @interface', array(
       '@plugin_id' => $plugin_id,
+      '@class' => $plugin_definition['class'],
       '@provider' => $plugin_definition['provider'],
       '@interface' => is_array($this->interface) ? implode(', ', $this->interface) : $this->interface,
     )));
diff --git a/core/modules/views/src/Plugin/ViewsJoinManager.php b/core/modules/views/src/Plugin/ViewsJoinManager.php
new file mode 100644
index 0000000..66411a1
--- /dev/null
+++ b/core/modules/views/src/Plugin/ViewsJoinManager.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Plugin\ViewsJoinManager.
+ */
+
+namespace Drupal\views\Plugin;
+
+/**
+ * Plugin type manager for all views handlers.
+ */
+class ViewsJoinManager extends ViewsHandlerManager {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $interface = '\Drupal\views\Plugin\views\join\JoinPluginInterface';
+
+}
diff --git a/core/modules/views/src/Plugin/views/join/JoinPluginBase.php b/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
index cd1dda3..d282f39 100644
--- a/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
+++ b/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
@@ -58,7 +58,7 @@
  *
  * Extensions of this class can be used to create more interesting joins.
  */
-class JoinPluginBase extends PluginBase {
+class JoinPluginBase extends PluginBase implements JoinPluginInterface {
 
   /**
    * The table to join (right table).
@@ -181,16 +181,7 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
   }
 
   /**
-   * Builds the SQL for the join this object represents.
-   *
-   * When possible, try to use table alias instead of table names.
-   *
-   * @param $select_query
-   *   An select query object.
-   * @param $table
-   *   The base table to join.
-   * @param \Drupal\views\Plugin\views\query\QueryPluginBase $view_query
-   *   The source views query.
+   * {@inheritdoc}
    */
   public function buildJoin($select_query, $table, $view_query) {
     if (empty($this->configuration['table formula'])) {
diff --git a/core/modules/views/src/Plugin/views/join/JoinPluginInterface.php b/core/modules/views/src/Plugin/views/join/JoinPluginInterface.php
new file mode 100644
index 0000000..03fefb2
--- /dev/null
+++ b/core/modules/views/src/Plugin/views/join/JoinPluginInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Plugin\views\join\JoinPluginInterface.
+ */
+
+namespace Drupal\views\Plugin\views\join;
+
+/**
+ * Represents a join and creates the SQL necessary to implement the join.
+ *
+ * Extensions of this class can be used to create more interesting joins.
+ */
+interface JoinPluginInterface {
+
+  /**
+   * Builds the SQL for the join this object represents.
+   *
+   * When possible, try to use table alias instead of table names.
+   *
+   * @param $select_query
+   *   An select query object.
+   * @param $table
+   *   The base table to join.
+   * @param \Drupal\views\Plugin\views\query\QueryPluginBase $view_query
+   *   The source views query.
+   */
+  public function buildJoin($select_query, $table, $view_query);
+
+}
diff --git a/core/modules/views/views.services.yml b/core/modules/views/views.services.yml
index b66568f..1917f4a 100644
--- a/core/modules/views/views.services.yml
+++ b/core/modules/views/views.services.yml
@@ -33,7 +33,7 @@ services:
     class: Drupal\views\Plugin\ViewsHandlerManager
     arguments: [filter, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler']
   plugin.manager.views.join:
-    class: Drupal\views\Plugin\ViewsHandlerManager
+    class: Drupal\views\Plugin\ViewsJoinManager
     arguments: [join, '@container.namespaces', '@views.views_data', '@cache.discovery', '@module_handler']
   plugin.manager.views.pager:
     class: Drupal\views\Plugin\ViewsPluginManager
diff --git a/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
index c337533..c202cbc 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
@@ -230,7 +230,7 @@ public function testGetDefinitionsWithJustValidInterfaces() {
    * @covers ::enforcePluginInterface
    *
    * @expectedException \Drupal\Component\Plugin\Exception\PluginException
-   * @expectedExceptionMessage Plugin kale in plugin_test should implement interface \Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface
+   * @expectedExceptionMessage Plugin "kale" (Drupal\plugin_test\Plugin\plugin_test\fruit\Kale) in plugin_test should implement interface \Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface
    */
   public function testGetDefinitionsWithInvalidInterfaces() {
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');