diff --git a/sites/all/modules/patched/conditional_fields/conditional_fields.module b/sites/all/modules/patched/conditional_fields/conditional_fields.module
index 6644c2c..d959cd6 100644
--- a/sites/all/modules/patched/conditional_fields/conditional_fields.module
+++ b/sites/all/modules/patched/conditional_fields/conditional_fields.module
@@ -239,7 +239,7 @@ function conditional_fields_element_after_build($element, &$form_state) {
 
   // Avoid processing fields in fields_ui administration pages.
   if (drupal_substr($form_state['complete form']['#form_id'], 0, 9) == 'field_ui_') {
-    return $element;    
+    return $element;
   }
 
   // Ensure that the element is a field.
@@ -264,7 +264,7 @@ function conditional_fields_element_after_build($element, &$form_state) {
   }
   else {
     $entity_type = $field['#entity_type'];
-    $bundle = $field['#bundle'];    
+    $bundle = $field['#bundle'];
   }
 
   $dependencies = conditional_fields_load_dependencies($entity_type, $bundle);
@@ -340,7 +340,7 @@ function conditional_fields_element_after_build($element, &$form_state) {
  *   - effect: The jQuery effect associated to the state change. See
  *     conditional_fields_effects() for available effects and options.
  *   - effect_options: The options for the active effect.
- *   - element_view: An associative array of field view behaviors with 
+ *   - element_view: An associative array of field view behaviors with
  *     CONDITIONAL_FIELDS_FIELD_VIEW_* constants as keys and the same constants
  *     as values for enabled behaviors and 0 for disabled behaviors.
  *     See conditional_fields_behaviors() for descriptions.
@@ -348,7 +348,7 @@ function conditional_fields_element_after_build($element, &$form_state) {
  *   - element_view_roles: An associative array of field view settings per role
  *     where the keys are role ids and the values are arrays with the same
  *     structure of 'element_view'.
- *   - element_edit: An associative array of field edit behaviors with 
+ *   - element_edit: An associative array of field edit behaviors with
  *     CONDITIONAL_FIELDS_FIELD_EDIT_* constants as keys and the same constants
  *     as values for enabled behaviors and 0 for disabled behaviors.
  *     See conditional_fields_behaviors() for descriptions.
@@ -439,6 +439,12 @@ function conditional_fields_form_after_build($form, $form_state) {
 
     foreach ($dependent_info['dependees'] as $dependency) {
       $dependee = $dependency['dependee'];
+
+      // If the dependee is not part of the form (due to permissions),
+      // continue to the next conditional field.
+      if (!isset($form['#conditional_fields'][$dependee])) {
+        continue;
+      }
       $dependee_info = $form['#conditional_fields'][$dependee];
       $dependee_form_field = drupal_array_get_nested_value($form, $dependee_info['parents']);
       $options = $dependency['options'];
@@ -606,7 +612,7 @@ function conditional_fields_form_after_build($form, $form_state) {
 function _conditional_fields_element_add_property(&$element, $property, $value) {
   if (isset($element[$property])) {
     if (in_array($value, $element[$property])) {
-      return;      
+      return;
     }
     $element[$property] = array_merge((array) $value, $element[$property]);
   }
@@ -899,7 +905,7 @@ function conditional_fields_evaluate_dependency($context, $values, $options) {
       foreach ($dependency_value as $key => $dependency_element_value) {
         // Ignore keys set in the field and not in the dependency.
         if (isset($values[$delta][$key]) && $values[$delta][$key] !== $dependency_element_value) {
-          return FALSE;          
+          return FALSE;
         }
       }
     }