diff --git a/glanceclient/tests/unit/v2/test_images.py b/glanceclient/tests/unit/v2/test_images.py
index b095634b..73bb074c 100644
--- a/glanceclient/tests/unit/v2/test_images.py
+++ b/glanceclient/tests/unit/v2/test_images.py
@@ -1100,8 +1100,6 @@ class TestController(testtools.TestCase):
         loc_map = dict([(l['url'], l) for l in orig_locations])
         loc_map[new_loc['url']] = new_loc
         mod_patch = [{'path': '/locations', 'op': 'replace',
-                      'value': []},
-                     {'path': '/locations', 'op': 'replace',
                       'value': list(loc_map.values())}]
         self.controller.update_location(image_id, **new_loc)
         self.assertEqual(self.api.calls, [
diff --git a/glanceclient/v2/images.py b/glanceclient/v2/images.py
index ed6a001d..2f2527c7 100644
--- a/glanceclient/v2/images.py
+++ b/glanceclient/v2/images.py
@@ -348,20 +348,17 @@ class Controller(object):
         image = self._get_image_with_locations_or_fail(image_id)
         url_map = dict([(l['url'], l) for l in image.locations])
         if url not in url_map:
-            raise exc.HTTPNotFound('Unknown URL: %s' % url)
+            raise exc.HTTPNotFound('Unknown URL: %s, the URL must be one of'
+                                   ' existing locations of current image' %
+                                   url)
 
         if url_map[url]['metadata'] == metadata:
             return image
 
-        # NOTE: The server (as of now) doesn't support modifying individual
-        # location entries. So we must:
-        #   1. Empty existing list of locations.
-        #   2. Send another request to set 'locations' to the new list
-        #      of locations.
         url_map[url]['metadata'] = metadata
         patches = [{'op': 'replace',
                     'path': '/locations',
-                    'value': p} for p in ([], list(url_map.values()))]
+                    'value': list(url_map.values())}]
         self._send_image_update_request(image_id, patches)
 
         return self.get(image_id)
diff --git a/glanceclient/v2/shell.py b/glanceclient/v2/shell.py
index 5f0728e1..1408027c 100644
--- a/glanceclient/v2/shell.py
+++ b/glanceclient/v2/shell.py
@@ -430,6 +430,10 @@ def do_location_update(gc, args):
     """Update metadata of an image's location."""
     try:
         metadata = json.loads(args.metadata)
+
+        if metadata == {}:
+            print("WARNING -- The location's metadata will be updated to "
+                  "an empty JSON object.")
     except ValueError:
         utils.exit('Metadata is not a valid JSON object.')
     else: