diff --git a/awx/api/authentication.py b/awx/api/authentication.py
index 0cdc60d757..8c1eceac97 100644
--- a/awx/api/authentication.py
+++ b/awx/api/authentication.py
@@ -39,6 +39,7 @@ class TokenAuthentication(authentication.TokenAuthentication):
         if token:
             token = urllib.unquote(token).strip('"')
             return 'token %s' % token
+        return ''
 
     def authenticate(self, request):
         self.request = request
diff --git a/awx/settings/development.py b/awx/settings/development.py
index facdc2ca54..cd25c3214c 100644
--- a/awx/settings/development.py
+++ b/awx/settings/development.py
@@ -76,11 +76,8 @@ include(optional('/etc/tower/conf.d/*.py'), scope=locals())
 # default settings for development.  If not present, we can still run using
 # only the defaults.
 try:
-    include(
-        optional('local_*.py'),
-        'postprocess.py',
-        scope=locals(),
-    )
+    include(optional('local_*.py'), scope=locals())
+    include('postprocess.py', scope=locals())
 except ImportError:
     traceback.print_exc()
     sys.exit(1)
diff --git a/awx/settings/production.py b/awx/settings/production.py
index c4980257e4..397f48070a 100644
--- a/awx/settings/production.py
+++ b/awx/settings/production.py
@@ -108,12 +108,8 @@ settings_file = os.environ.get('AWX_SETTINGS_FILE',
 # Attempt to load settings from /etc/tower/settings.py first, followed by
 # /etc/tower/conf.d/*.py.
 try:
-    include(
-        settings_file,
-        optional(settings_files),
-        'postprocess.py',
-        scope=locals(),
-    )
+    include(settings_file, optional(settings_files), scope=locals())
+    include('postprocess.py', scope=locals())
 except ImportError:
     traceback.print_exc()
     sys.exit(1)