diff --git a/mistralclient/api/httpclient.py b/mistralclient/api/httpclient.py
index 411a93ea..f04598f1 100644
--- a/mistralclient/api/httpclient.py
+++ b/mistralclient/api/httpclient.py
@@ -128,7 +128,8 @@ class HTTPClient(object):
         if target_auth_uri:
             headers['X-Target-Auth-Uri'] = target_auth_uri
 
-        # Add headers for osprofiler.
-        headers.update(osprofiler_web.get_trace_id_headers())
+        if osprofiler_web:
+            # Add headers for osprofiler.
+            headers.update(osprofiler_web.get_trace_id_headers())
 
         return headers