diff --git a/sites/all/modules/contrib/form_builder/includes/form_builder.admin.inc b/sites/all/modules/contrib/form_builder/includes/form_builder.admin.inc
index debaa28..8af8635 100644
--- a/sites/all/modules/contrib/form_builder/includes/form_builder.admin.inc
+++ b/sites/all/modules/contrib/form_builder/includes/form_builder.admin.inc
@@ -348,7 +348,9 @@ function theme_form_builder_element_wrapper($variables) {
     $output .= '</div>';
   }
 
-  $output .= '<div class="form-builder-element form-builder-element-' . $element['#type'] . '" id="form-builder-element-' . $element['#form_builder']['element_id'] . '">';
+  $element_id = isset($element['#form_builder']['element_id']) ? $element['#form_builder']['element_id'] : '';
+  $output .= '<div class="form-builder-element form-builder-element-' . $element['#type'] . '" id="form-builder-element-' . $element_id . '">';
+
   // TODO: Overlay image: good idea or bad idea? Prevents any interaction with
   // form elements in the preview.
   //$output .= theme('image', drupal_get_path('module', 'form_builder') .'/images/blank.gif', '', '', array('width' => '1', 'height' => '1', 'class' => 'form-builder-disable'));
diff --git a/sites/all/modules/contrib/form_builder/modules/webform/form_builder_webform.module b/sites/all/modules/contrib/form_builder/modules/webform/form_builder_webform.module
index fb97141..e857caa 100644
--- a/sites/all/modules/contrib/form_builder/modules/webform/form_builder_webform.module
+++ b/sites/all/modules/contrib/form_builder/modules/webform/form_builder_webform.module
@@ -214,7 +214,7 @@ function form_builder_webform_form_builder_properties($form_type) {
  * Load a complete FAPI array based on a form type and ID.
  */
 function form_builder_webform_form_builder_load($form_builder_type, $form_builder_id) {
-  if ($form_builder_type == 'webform') {
+  if ($form_builder_type == 'webform' && is_numeric($form_builder_id)) {
     // Webform identifies its forms by Node Id.
     $nid = $form_builder_id;
     $node = node_load($nid);
diff --git a/sites/all/modules/contrib/webform_alt_ui/webform_alt_ui.module b/sites/all/modules/contrib/webform_alt_ui/webform_alt_ui.module
index 8355a72..ce5b20a 100644
--- a/sites/all/modules/contrib/webform_alt_ui/webform_alt_ui.module
+++ b/sites/all/modules/contrib/webform_alt_ui/webform_alt_ui.module
@@ -507,6 +507,7 @@ function _webform_alt_ui_webform_settings(&$form, &$form_state) {
   // Add the default webform configuration form to the node edit form. We will
   // alter what we just added in the rest of this function below.
   $node = $form['#node'];
+  $node->nid = isset($node->nid) ? $node->nid : NULL;
   $form += webform_configure_form($form, $form_state, $node);
 
   // Collapse the submission settings fieldset by default and remove the submit
@@ -850,6 +851,7 @@ function _webform_alt_ui_webform_form(&$form, &$form_state) {
       'configurable' => FALSE,
       'removable' => FALSE,
     ),
+    '#webform_component' => array('type' => 'markup'),
   );
 
   // Add a tab for Add field