diff --git a/webform_share.module b/webform_share.module
index 47f00c5..2dec2ec 100644
--- a/webform_share.module
+++ b/webform_share.module
@@ -107,7 +107,7 @@ function webform_share_components_update_form($form, &$form_state, $node, $op =
   );
   if ($op == 'reset') {
     $form['import']['#access'] = FALSE;
-    $form['import']['#default_value'] = variable_get('webform_share_'. $form['#node']->type, '');
+    $form['import']['#default_value'] = variable_get('webform_share_'. $node->type, '');
   }
   $form['submit'] = array(
     '#type' => 'submit',
@@ -123,7 +123,6 @@ function webform_share_components_update_form($form, &$form_state, $node, $op =
 function webform_share_components_update_form_submit($form, &$form_state) {
   $node = $form_state['node'];
   if ($webform = _webform_share_eval($form_state['values']['import'])) {
-
     // Load the original node and use this to map any fields based off
     // the form_key parameter. We need to preserve the existing cid if
     // possible to preserve the submission data.
@@ -234,5 +233,5 @@ function webform_share_node_insert($node) {
  */
 function _webform_share_eval($str) {
   eval($str);
-  return $webform;
+  return empty($webform) ? FALSE : $webform;
 }