diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module
index 986e00c..4498d2f 100644
--- a/core/modules/menu_link/menu_link.module
+++ b/core/modules/menu_link/menu_link.module
@@ -81,6 +81,11 @@ function menu_link_delete($mlid) {
  *   Defaults to FALSE.
  */
 function menu_link_delete_multiple(array $mlids, $force = FALSE, $prevent_reparenting = FALSE) {
+  if (!$mlids) {
+    // If no IDs or invalid IDs were passed, do nothing.
+    return;
+  }
+
   $controller = entity_get_controller('menu_link');
   if (!$force) {
     $entity_query = entity_query('menu_link');
diff --git a/core/update.php b/core/update.php
index 968e8f4..d5d281e 100644
--- a/core/update.php
+++ b/core/update.php
@@ -460,6 +460,10 @@ function update_check_requirements($skip_warnings = FALSE) {
 $container->register('router.builder', 'Drupal\Core\Routing\RouteBuilder')
   ->addArgument(new Reference('router.dumper'))
   ->addArgument(new Reference('lock'));
+$container->register('entity.query', 'Drupal\Core\Entity\Query\QueryFactory')
+  ->addArgument(new Reference('service_container'));
+$container->register('entity.query.field_sql_storage', 'Drupal\field_sql_storage\Entity\QueryFactory')
+  ->addArgument(new Reference('database'));
 
 // Turn error reporting back on. From now on, only fatal errors (which are
 // not passed through the error handler) will cause a message to be printed.