diff -u b/conditional_fields.api.inc b/conditional_fields.api.inc
--- b/conditional_fields.api.inc
+++ b/conditional_fields.api.inc
@@ -409,13 +409,11 @@
       $values = $values[$dependee_parent[$dependee]['#language']];
     }
 
-    if(is_array($dependent['field_parents']) && count($dependent['field_parents']) > 0) {
-      if ($grouping) {
-        $evaluated_dependees[reset($dependent['field_parents'])][$dependency['options']['grouping']][] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
-      }
-      else {
-        $evaluated_dependees[reset($dependent['field_parents'])][$dependency['options']['grouping']][$dependency['options']['state']] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
-      }
+    if ($grouping) {
+      $evaluated_dependees[reset($dependent['field_parents'])][$dependency['options']['grouping']][] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
+    }
+    else {
+      $evaluated_dependees[reset($dependent['field_parents'])][$dependency['options']['grouping']][$dependency['options']['state']] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
     }
   }
 
@@ -426,11 +424,13 @@
       $values = $values[$dependee_parent[$dependee]['#language']];
     }
 
-    if ($grouping) {
-      $evaluated_dependees[reset($dependent['field_parents'])][$dependency['options']['grouping']][] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
-    }
-    else {
-      $evaluated_dependees[reset($dependent['field_parents'])][$dependency['options']['grouping']][$dependency['options']['state']] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
+    if(is_array($dependent['field_parents']) && count($dependent['field_parents']) > 0) {
+      if ($grouping) {
+        $evaluated_dependees[reset($dependent['field_parents'])][$dependency['options']['grouping']][] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
+      }
+      else {
+        $evaluated_dependees[reset($dependent['field_parents'])][$dependency['options']['grouping']][$dependency['options']['state']] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
+      }
     }
   }
 
@@ -505,9 +505,6 @@
 
     // Reinstate remaining errors.
     foreach ($errors as $name => $error) {
-      if(!isset($form[$name]) || !is_array($form[$name])) {
-        continue;
-      }
       $form_state->setError($form[$name], $error);
       // form_set_error() calls drupal_set_message(), so we have to filter out
       // these from the messages to avoid duplicates.
@@ -519,7 +516,11 @@
 
     // Reinstate remaining errors.
     foreach ($errors as $name => $error) {
-      $form_state->setErrorByName($name, $error);
+      if(!isset($form[$name]) || !is_array($form[$name])) {
+        continue;
+      }
+      $form_state->setErrorByName($form[$name], $error);
+
       // form_set_error() calls drupal_set_message(), so we have to filter out
       // these from the messages to avoid duplicates.
       $removed_messages[] = $error;
@@ -664,9 +665,7 @@
   }
 
   if (!empty($options['values']) && is_string($options['values'])) {
-    $options['values'] = preg_split('/\R/', $options['values']);
-    if(!empty($values_array) && end($values_array) == "")
-      array_pop($values_array);
+    $options['values'] = explode("\r\n", $options['values']);
   }
 
   switch ($options['values_set']) {
@@ -679,7 +678,9 @@
   }
 
   if (!empty($options['values']) && is_string($options['values'])) {
-    $options['values'] = explode("\r\n", $options['values']);
+    $options['values'] = preg_split('/\R/', $options['values']);
+    if(!empty($values_array) && end($values_array) == "")
+      array_pop($values_array);
   }
 
   switch ($options['values_set']) {