diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 8bd218b..34e7919 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -342,7 +342,7 @@ function seven_form_element($variables) {
     if (!empty($element['#id'])) {
       $attributes['id'] = $element['#id'] . '--description';
     }
-    if (isset($element['#parents']) && form_get_error($element) !== NULL && !empty($element['#validated'])) {
+    if (isset($element['#parents']) && !empty($element['#errors']) && !empty($element['#validated'])) {
       $attributes['class'][] = 'error';
     }
     $output .= '<div' . new Attribute($attributes) . '>' . $element['#description'] . "</div>\n";
@@ -379,7 +379,7 @@ function seven_form_element_label($variables) {
   elseif ($element['#title_display'] == 'invisible') {
     $attributes['class'][] = 'visually-hidden';
   }
-  if (isset($element['#parents']) && form_get_error($element) !== NULL && !empty($element['#validated'])) {
+  if (isset($element['#parents']) && !empty($element['#errors']) && !empty($element['#validated'])) {
     $attributes['class'][] = 'error';
   }
 
@@ -389,3 +389,4 @@ function seven_form_element_label($variables) {
 
   return '<label' . new Attribute($attributes) . '>' . t('!title!required', array('!title' => $title, '!required' => $required)) . '</label>';
 }
+