diff --git a/openstackclient/compute/client.py b/openstackclient/compute/client.py
index 7ca08a4f23..bdba4dca3e 100644
--- a/openstackclient/compute/client.py
+++ b/openstackclient/compute/client.py
@@ -30,6 +30,9 @@ LOG = logging.getLogger(__name__)
 DEFAULT_COMPUTE_API_VERSION = '2'
 API_VERSION_OPTION = 'os_compute_api_version'
 API_NAME = 'compute'
+API_VERSIONS = {
+    "2": "novaclient.client",
+}
 
 
 def make_client(instance):
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index 3cfd731219..ebc80c2a30 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -247,6 +247,11 @@ class OpenStackShell(app.App):
             if version_opt:
                 api = mod.API_NAME
                 self.api_version[api] = version_opt
+                if version_opt not in mod.API_VERSIONS:
+                    self.log.warning(
+                        "The %s version <%s> is not in supported versions <%s>"
+                        % (api, version_opt,
+                           ', '.join(mod.API_VERSIONS.keys())))
                 # Command groups deal only with major versions
                 version = '.v' + version_opt.replace('.', '_').split('_')[0]
                 cmd_group = 'openstack.' + api.replace('-', '_') + version