diff --git a/conditional_fields.module b/conditional_fields.module
index 310c131..cbb6c2f 100644
--- a/conditional_fields.module
+++ b/conditional_fields.module
@@ -232,11 +232,6 @@ function conditional_fields_element_info_alter(&$types) {
  * - Field dependencies data.
  */
 function conditional_fields_element_after_build($element, &$form_state) {
-  // Ensure that the form being built is an entity.
-  if (!isset($form_state['complete form']['#entity_type'], $form_state['complete form']['#bundle'])) {
-    return $element;
-  }
-
   // Avoid processing fields in fields_ui administration pages.
   if (drupal_substr($form_state['complete form']['#form_id'], 0, 9) == 'field_ui_') {
     return $element;    
@@ -259,18 +254,12 @@ function conditional_fields_element_after_build($element, &$form_state) {
   // since in case of fields in entities within entities they won't correspond,
   // and their dependencies will not be loaded.
   if (!isset($field['#entity_type'], $field['#bundle'])) {
-    $entity_type = $form_state['complete form']['#entity_type'];
-    $bundle = $form_state['complete form']['#bundle'];
+    return $element;
   }
   else {
     $entity_type = $field['#entity_type'];
-    $bundle = $field['#bundle'];    
-  }
-
-  $dependencies = conditional_fields_load_dependencies($entity_type, $bundle);
-
-  if (!$dependencies) {
-    return $element;
+    $bundle = $field['#bundle'];
+    $dependencies = conditional_fields_load_dependencies($entity_type, $bundle);
   }
 
   // Attach dependent.