diff --git a/glanceclient/shell.py b/glanceclient/shell.py
index 82195c8..492f35a 100755
--- a/glanceclient/shell.py
+++ b/glanceclient/shell.py
@@ -577,6 +577,9 @@ class OpenStackImagesShell(object):
 
                     with open(schema_file_path, 'w') as f:
                         f.write(json.dumps(schema.raw()))
+                except exc.Unauthorized:
+                    raise exc.CommandError(
+                        "Invalid OpenStack Identity credentials.")
                 except Exception:
                     # NOTE(esheffield) do nothing here, we'll get a message
                     # later if the schema is missing