diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 7a0100e5..bfe7937a 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -796,6 +796,14 @@ class UserController extends BaseAuthedController {
         }
         error_log($response);
         $rspObj = json_decode($response, true);
+        if (!$rspObj['data']['address']){
+            User::Update(array(
+                'address' => null
+            ));
+            myself()->_rspOk();
+            die();
+            return;
+        }
         User::Update(array(
             'address' => $rspObj['data']['address']
         ));