diff --git a/webform_conditional.module b/webform_conditional.module
index 6bf2f78..0ac5df7 100644
--- a/webform_conditional.module
+++ b/webform_conditional.module
@@ -30,7 +30,7 @@ function webform_conditional_form_webform_component_edit_form_alter(&$form, &$fo
           if ($row = $result->fetchAssoc()) {
             //not dealing with a new component
             $extra = unserialize($row['extra']);
-            $default_value =  trim(isset($extra['webform_conditional_field_value']) ? $extra['webform_conditional_field_value'] : '');
+            $default_value =  isset($extra['webform_conditional_field_value']) ? trim($extra['webform_conditional_field_value']) : '';
             //don't check for empty b/c 0 could only value
             if ($default_value !== '') {
               //has existing value from this module
@@ -363,7 +363,7 @@ function _webform_conditional_was_hidden($cid, $components) {
   $fieldset_hidden = FALSE;
   $trigger_hidden = FALSE;
   $this_hidden = FALSE;
-  if ($components[$cid]['extra']['webform_conditional_cid']) {
+  if (isset($components[$cid]['extra']['webform_conditional_cid']) && $components[$cid]['extra']['webform_conditional_cid']) {
     //was hidden conditional
     foreach ($components as $component) {
       if ($component['cid'] == $components[$cid]['extra']['webform_conditional_cid']) {
@@ -599,13 +599,14 @@ function &_webform_conditional_get_field(&$fields, $cid) {
     }
   }
   foreach ($fields as $key => &$field) {
-    if (is_array($fields[$key]) && $fields[$key]['#type'] == 'fieldset') {
+    if (isset($fields[$key]['#type']) && $fields[$key]['#type'] == 'fieldset') {
       if ($innerField = & _webform_conditional_get_field($fields[$key], $cid)) {
         return $innerField;
       }
     }
   }
-  return NULL;
+  $null = NULL;
+  return $null;
 }
 /**
  * Implements hook_webform_submission_render_alter().