Index: branches/version-2/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php
===================================================================
--- branches/version-2/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	(revision 17679)
+++ branches/version-2/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php	(revision 17683)
@@ -124,13 +124,20 @@
                     $deliv_count = $objQuery->count("dtb_other_deliv", "customer_id=?", array($objCustomer->getValue('customer_id')));
                     if ($deliv_count < DELIV_ADDR_MAX or isset($_POST['other_deliv_id'])){
-                        $deliv_count = $objQuery->count("dtb_other_deliv","customer_id=? and other_deliv_id = ?" ,array($objCustomer->getValue('customer_id'), $_POST['other_deliv_id']));
-                            if ($deliv_count == 1) {
-                            $this->lfRegistData($_POST,$arrRegistColumn, $objCustomer);
-                        } else {
+                        if(strlen($_POST['other_deliv_id'] != 0)){
+                            $deliv_count = $objQuery->count("dtb_other_deliv","customer_id=? and other_deliv_id = ?" ,array($objCustomer->getValue('customer_id'), $_POST['other_deliv_id']));
+                            if ($deliv_count == 0) {
+                                SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
+                            }else{
+                                $this->lfRegistData($_POST,$arrRegistColumn, $objCustomer);                                
+                            }
+                        }else{
+                            $this->lfRegistData($_POST,$arrRegistColumn, $objCustomer);                            
+                        }
+                    }
+                        if( $_POST['ParentPage'] == MYPAGE_DELIVADDR_URL || $_POST['ParentPage'] == URL_DELIV_TOP ){
+                            $this->tpl_onload = "fnUpdateParent('". $this->getLocation($_POST['ParentPage']) ."'); window.close();";
+                        }else{
                             SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
                         }
-                    }
-                    
-                    $this->tpl_onload = "fnUpdateParent('". $this->getLocation($_POST['ParentPage']) ."'); window.close();";
                 }
                 break;