diff --git a/common/djangoapps/mitxmako/shortcuts.py b/common/djangoapps/mitxmako/shortcuts.py
index 673efd09dc..4298c60f71 100644
--- a/common/djangoapps/mitxmako/shortcuts.py
+++ b/common/djangoapps/mitxmako/shortcuts.py
@@ -14,10 +14,12 @@
 
 from django.template import Context
 from django.http import HttpResponse
+import logging
 
 from . import middleware
 from django.conf import settings
 from django.core.urlresolvers import reverse
+log = logging.getLogger(__name__)
 
 
 def marketing_link(name):
@@ -32,14 +34,16 @@ def marketing_link(name):
     # link_map maps URLs from the marketing site to the old equivalent on
     # the Django site
     link_map = settings.MKTG_URL_LINK_MAP
-    if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
+    if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE') and name in settings.MKTG_URLS:
         # special case for when we only want the root marketing URL
         if name == 'ROOT':
             return settings.MKTG_URLS.get('ROOT')
         return settings.MKTG_URLS.get('ROOT') + settings.MKTG_URLS.get(name)
-    elif name in link_map:
+    # only link to the old pages when the marketing site isn't on
+    elif not settings.MITX_FEATURES.get('ENABLE_MKTG_SITE') and name in link_map:
         return reverse(link_map[name])
     else:
+        log.warning("Cannot find corresponding link for name: {name}".format(name=name))
         return '#'
 
 
diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 769caf615c..8a922d0444 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -80,7 +80,7 @@ META_UNIVERSITIES = ENV_TOKENS.get('META_UNIVERSITIES', {})
 COMMENTS_SERVICE_URL = ENV_TOKENS.get("COMMENTS_SERVICE_URL", '')
 COMMENTS_SERVICE_KEY = ENV_TOKENS.get("COMMENTS_SERVICE_KEY", '')
 CERT_QUEUE = ENV_TOKENS.get("CERT_QUEUE", 'test-pull')
-MKTG_URLS = ENV_TOKENS.get('MKTG_URLS', {})
+MKTG_URLS = ENV_TOKENS.get('MKTG_URLS', MKTG_URLS)
 
 ############################## SECURE AUTH ITEMS ###############
 # Secret things: passwords, access keys, etc.