diff --git a/uc_attributes_in_cart.module b/uc_attributes_in_cart.module
index cb102ff..5b4f857 100644
--- a/uc_attributes_in_cart.module
+++ b/uc_attributes_in_cart.module
@@ -334,7 +334,7 @@ function uc_attributes_in_cart_form_alter(&$form, &$form_state, $form_id) {
             }
 
             // Get the attributes' forms.
-            $value['attributes_in_cart'] = _uc_attribute_alter_form($product);
+            $value['attributes_in_cart'] = _uc_attribute_alter_form('attribute_in_cart', $product, false);
 
             // Check if the product has attributes.
             if ($value['attributes_in_cart'] != NULL) {
@@ -353,8 +353,12 @@ function uc_attributes_in_cart_form_alter(&$form, &$form_state, $form_id) {
 
                   // Show the attribute's form.
                   if (!isset($display_attribute_settings['show_form']) || $display_attribute_settings['show_form']) {
-                    // Set the default value(s).
-                    $attribute_form['#default_value'] = $items[$item_id]->data['attributes'][$aid];
+                    
+					// Set the default value(s). add if not null check
+                   if(isset($items[$item_id]->data['attributes'][$aid]))
+				   {
+				   $attribute_form['#default_value'] = $items[$item_id]->data['attributes'][$aid];
+				   }
 
                     // Do not display the title (by default it is displayed).
                     if (isset($display_attribute_settings['show_title']) && !$display_attribute_settings['show_title']) {
@@ -415,11 +419,10 @@ function uc_attributes_in_cart_form_alter(&$form, &$form_state, $form_id) {
         }
       }
     }
-
+	
     // Make the 'update cart' and 'checkout' buttons process our submit function.
-    $form['#submit'][] = 'uc_attributes_in_cart_cart_view_form_submit';
-    $form['update']['#submit'][] = 'uc_attributes_in_cart_cart_view_form_submit';
-    $form['checkout']['#submit'][] = 'uc_attributes_in_cart_cart_view_form_submit';
+    $form['actions']['update']['#submit'][] = 'uc_attributes_in_cart_cart_view_form_submit';
+	$form['actions']['checkout']['checkout']['#submit'][] = 'uc_attributes_in_cart_cart_view_form_submit';
   }
 }
 
@@ -525,6 +528,7 @@ function uc_attributes_in_cart_cart_view_form_submit($form, &$form_state) {
               // Check if the attribute's form was enclosed in a fieldset.
               if (is_array($option) && array_key_exists('attribute_form', $option)) {
                 // Enclosed.
+				
                 $cart_item->data['attributes'][$aid] = $option['attribute_form'];
               }