diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f33a05..ee5f4cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
 The versions coincide with releases on pip. Only major versions will be released as tags on Github.
 
 ## [0.0.x](https://github.com/singularityhub/sregistry-cli/tree/master) (0.0.x)
+ - docker auth is undefined, and storage attribute needs to be checked for naming (0.01.40)
  - fixing bug with tag specification for registry pull (0.01.39)
  - registry client should honor base, if provided with uri (0.01.38)
  - added google-build client, building with google build and sending to google storage (0.01.37)
diff --git a/README.md b/README.md
index 07f6218..fd35ddb 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Hi Friends! Are your containers lonely? Singularity containers thrive in happine
 
 Singularity Global Client is an interface to interact with Singularity containers in many different storage locations. We are able to use modern APIs by way of providing and using the software within a Singularity container! For older architectures, we provide a [Singularity container](Singularity) for you to use instead. You can build it from this repository, or use the provided container on [Singularity Hub](https://www.singularity-hub.org/collections/379).
 
-See our [installation guide](https://singularityhub.github.io/sregistry-cli/install) to get started. For more details, please refer to our [documentation](docs)
+If used for the Singularity Registry client, Python 3 is required. See our [installation guide](https://singularityhub.github.io/sregistry-cli/install) to get started. For more details, please refer to our [documentation](docs).
 
 ## Building the RPM
 
diff --git a/docs/clients/registry.md b/docs/clients/registry.md
index d413a23..fffea81 100644
--- a/docs/clients/registry.md
+++ b/docs/clients/registry.md
@@ -18,6 +18,7 @@ The following commands are not yet developed or implemented, but can be (please
 
  - *delete*: `[remote]`: delete an image from a remote endpoint if you have the correct credential (note this isn't implemented yet for the registry, but is noted here as a todo).
 
+If you are using `sregistry` for a Singularity Registry, Python 3.3+ is required.
 
 ## Install
 The Singularity Registry client for sregistry is recommended for use with Python 3, since it uses the datetime package to help with the credential header (if you have a workaround for this, please contribute since it causes issues for many). To install the dependencies:
diff --git a/setup.py b/setup.py
index c41cf39..e53e17b 100644
--- a/setup.py
+++ b/setup.py
@@ -143,7 +143,6 @@ def get_reqs(lookup=None, key='INSTALL_REQUIRES'):
               'Topic :: Software Development',
               'Topic :: Scientific/Engineering',
               'Operating System :: Unix',
-              'Programming Language :: Python :: 2.7',
-              'Programming Language :: Python :: 3',
+              'Programming Language :: Python :: 3.3',
           ],
           entry_points = {'console_scripts': [ 'sregistry=sregistry.client:main' ] })
diff --git a/sregistry/main/base/settings.py b/sregistry/main/base/settings.py
index 4cfecb0..cbbcd6d 100644
--- a/sregistry/main/base/settings.py
+++ b/sregistry/main/base/settings.py
@@ -118,6 +118,11 @@ def get_storage_name(self, names, remove_dir=False):
        names: the output from parse_image_name
     '''
     storage_folder = os.path.dirname(names['storage'])
+
+    # If the client doesn't have a database, default to PWD
+    if not hasattr(self, 'storage'):
+        return os.path.basename(names['storage'])
+        
     storage_folder = "%s/%s" %(self.storage, storage_folder)
     mkdir_p(storage_folder)
     file_name = names['storage'].replace('/','-')
diff --git a/sregistry/main/docker/__init__.py b/sregistry/main/docker/__init__.py
index 480cc24..a4ece18 100644
--- a/sregistry/main/docker/__init__.py
+++ b/sregistry/main/docker/__init__.py
@@ -135,6 +135,7 @@ def _update_secrets(self):
         password = self._get_setting('SREGISTRY_DOCKERHUB_PASSWORD', password)
 
         # Option 1: the user exports username and password
+        auth = None
         if username is not None and password is not None:
             auth = basic_auth_header(username, password)
             self.headers.update(auth)
diff --git a/sregistry/version.py b/sregistry/version.py
index e0c4d05..0d95a0c 100644
--- a/sregistry/version.py
+++ b/sregistry/version.py
@@ -8,7 +8,7 @@
 
 '''
 
-__version__ = "0.1.39"
+__version__ = "0.1.40"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = 'vsochat@stanford.edu'
 NAME = 'sregistry'