diff --git a/core/lib/Drupal/Core/Condition/ConditionAccessResolverTrait.php b/core/lib/Drupal/Core/Condition/ConditionAccessResolverTrait.php
index 35587eb..528e662 100644
--- a/core/lib/Drupal/Core/Condition/ConditionAccessResolverTrait.php
+++ b/core/lib/Drupal/Core/Condition/ConditionAccessResolverTrait.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Condition;
 
-use Drupal\Component\Plugin\Exception\PluginException;
+use Drupal\Component\Plugin\Exception\ContextException;
 
 /**
  * Resolves a set of conditions.
@@ -30,7 +30,7 @@ protected function resolveConditions($conditions, $condition_logic) {
       try {
         $pass = $condition->execute();
       }
-      catch (PluginException $e) {
+      catch (ContextException $e) {
         // If a condition is missing context, consider that a fail.
         $pass = FALSE;
       }
diff --git a/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php b/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
index dc676c5..8081ea8 100644
--- a/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\Tests\Core\Condition;
 
+use Drupal\Component\Plugin\Exception\ContextException;
 use Drupal\Core\Condition\ConditionAccessResolverTrait;
-use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -58,7 +58,7 @@ public function providerTestResolveConditions() {
     $condition_exception = $this->getMock('Drupal\Core\Condition\ConditionInterface');
     $condition_exception->expects($this->any())
       ->method('execute')
-      ->will($this->throwException(new PluginException()));
+      ->will($this->throwException(new ContextException()));
 
     $conditions = array();
     $data[] = array($conditions, 'and', TRUE);