diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index fe6d43d..cd31e87 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -145,7 +145,7 @@ public function loadMultiple(array $ids = NULL) {
    */
   public function load($id) {
     $entities = $this->loadMultiple(array($id));
-    return isset($entities[$id]) ? $entities[$id] : FALSE;
+    return isset($entities[$id]) ? $entities[$id] : NULL;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index bfcf829..867354d 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -182,7 +182,7 @@ public function loadMultiple(array $ids = NULL) {
    */
   public function load($id) {
     $entities = $this->loadMultiple(array($id));
-    return isset($entities[$id]) ? $entities[$id] : FALSE;
+    return isset($entities[$id]) ? $entities[$id] : NULL;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
index 50e1ba9..50b7d7c 100644
--- a/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
+++ b/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
@@ -93,9 +93,6 @@ public function process(array &$variables, Route $route, array &$converted) {
 
         $storageController = $this->entityManager->getStorageController($type);
         $entity = $storageController->load($value);
-
-        // Make sure $entities is null, if upcasting fails.
-        $entity = $entity ?: NULL;
         $variables[$name] = $entity;
 
         // Mark this variable as converted.
diff --git a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php b/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php
index 339f971..93afecb 100644
--- a/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php
+++ b/core/modules/action/lib/Drupal/action/ActionFormControllerBase.php
@@ -111,7 +111,7 @@ public function form(array $form, array &$form_state) {
    */
   public function exists($id) {
     $action = $this->storageController->load($id);
-    return ($action !== FALSE);
+    return !empty($action);
   }
 
   /**