diff --git a/heat/common/client.py b/heat/common/client.py
index 1e1a12483d..e667ce2edf 100644
--- a/heat/common/client.py
+++ b/heat/common/client.py
@@ -525,6 +525,8 @@ class BaseClient(object):
                 raise exception.MultipleChoices(body=res.read())
             elif status_code == httplib.INTERNAL_SERVER_ERROR:
                 raise Exception("Internal Server error: %s" % res.read())
+            elif status_code == httplib.REQUEST_URI_TOO_LONG:
+                raise exception.RequestUriTooLong(body=res.read())
             else:
                 raise Exception("Unknown error occurred! %s" % res.read())
 
diff --git a/heat/common/exception.py b/heat/common/exception.py
index 0c8a45b47c..8e4ef7a7ed 100644
--- a/heat/common/exception.py
+++ b/heat/common/exception.py
@@ -141,6 +141,8 @@ class MultipleChoices(HeatException):
                 "means that you have not included a version indicator in a "
                 "request URI.\n\nThe body of response returned:\n%(body)s")
 
+class RequestUriTooLong(HeatException):
+    message = _("The URI was too long.")
 
 class InvalidContentType(HeatException):
     message = _("Invalid content type %(content_type)s")