diff --git a/core/includes/form.inc b/core/includes/form.inc
index ff9d7c9..726cf2d 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -2931,7 +2931,7 @@ function _form_set_attributes(&$element, $class = array()) {
     $element['#attributes']['required'] = 'required';
     $element['#attributes']['aria-required'] = 'true';
   }
-  if (isset($element['#parents']) && !empty($element['#errors']) && !empty($element['#validated'])) {
+  if (isset($element['#parents']) && isset($element['#errors']) && !empty($element['#validated'])) {
     $element['#attributes']['class'][] = 'error';
     $element['#attributes']['aria-invalid'] = 'true';
   }
diff --git a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
index f612354..143e371 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Form/FormTest.php
@@ -236,9 +236,6 @@ function testRequiredCheckboxesRadio() {
    * @see form_test_validate_required_form_no_title()
    */
   function testRequiredTextfieldNoTitle() {
-    $form = $form_state = array();
-    form_test_validate_required_form_no_title($form, $form_state);
-
     // Attempt to submit the form with no required field set.
     $edit = array();
     $this->drupalPostForm('form-test/validate-required-no-title', $edit, 'Submit');
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index 4fe341d..9f9b55b 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -675,7 +675,7 @@ function update_manager_install_form_submit($form, &$form_state) {
 
   $directory = _update_manager_extract_directory();
   try {
-    $archive = update_manager_archive_extract($local_cache, $form_state, $directory);
+    $archive = update_manager_archive_extract($local_cache, $directory);
   }
   catch (Exception $e) {
     form_set_error($field, $form_state, $e->getMessage());