diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index df404d8..161b914 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\Component\Uuid\Uuid;
 use Drupal\Component\Utility\String;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
@@ -957,10 +958,17 @@ public function loadEntityByUuid($entity_type_id, $uuid) {
     if (!$uuid_key = $entity_type->getKey('uuid')) {
       throw new EntityStorageException("Entity type $entity_type_id does not support UUIDs.");
     }
+    
+    //Immediately return NULL for empty or invalid UUID's.
+    if (empty($uuid) || !(is_string($uuid))) {
+      return NULL;
+    }
 
     $entities = $this->getStorage($entity_type_id)->loadByProperties(array($uuid_key => $uuid));
 
-    return reset($entities);
+    if (!reset($entities)) {
+      return NULL;
+    }
   }
 
   /**
diff --git a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
index 13f9862..f3f9673 100644
--- a/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityManagerInterface.php
@@ -451,8 +451,8 @@ public function getFormModeOptions($entity_type_id, $include_disabled = FALSE);
    * @param string $uuid
    *   The UUID of the entity to load.
    *
-   * @return \Drupal\Core\Entity\EntityInterface|FALSE
-   *   The entity object, or FALSE if there is no entity with the given UUID.
+   * @return \Drupal\Core\Entity\EntityInterface|NULL
+   *   The entity object, or NULL if there is no entity with the given UUID.
    *
    * @throws \Drupal\Core\Entity\EntityStorageException
    *   Thrown in case the requested entity type does not support UUIDs.