From c36f57d7e984c4072e74f24664114a2bede8ee27 Mon Sep 17 00:00:00 2001
From: Ng Kiat Siong <kiatsiong.ng@gmail.com>
Date: Tue, 11 Jul 2023 17:14:53 +0800
Subject: [PATCH] Fixed $address is null in AddressController. (#3373)

---
 app/code/core/Mage/Customer/controllers/AddressController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/core/Mage/Customer/controllers/AddressController.php b/app/code/core/Mage/Customer/controllers/AddressController.php
index 0493cbff974..f8ae1efb3fe 100644
--- a/app/code/core/Mage/Customer/controllers/AddressController.php
+++ b/app/code/core/Mage/Customer/controllers/AddressController.php
@@ -151,9 +151,11 @@ public function formPostAction()
                 $this->_getSession()->setAddressFormData($this->getRequest()->getPost())
                     ->addException($e, $this->__('Cannot save address.'));
             }
+
+            return $this->_redirectError(Mage::getUrl('*/*/edit', ['id' => $address->getId()]));
         }
 
-        return $this->_redirectError(Mage::getUrl('*/*/edit', ['id' => $address->getId()]));
+        $this->_redirectReferer();
     }
 
     /**