includes/form.inc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/includes/form.inc b/includes/form.inc
index c0163ca..56dafea 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -3973,8 +3973,11 @@ function _form_set_class(&$element, $class = array()) {
   if (!empty($element['#required'])) {
     $element['#attributes']['class'][] = 'required';
   }
-  if (isset($element['#parents']) && form_get_error($element)) {
-    $element['#attributes']['class'][] = 'error';
+  if (isset($element['#parents'])) {
+    $form_error = form_get_error($element);
+	if (isset($form_error)) {
+      $element['#attributes']['class'][] = 'error';
+	}
   }
 }