diff --git a/AUTHORS b/AUTHORS
index a6926b37b2..5af5c71f6e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -313,7 +313,7 @@ answer newbie questions, and generally made Django that much better:
     Vlado <vlado@labath.org>
     Milton Waddams
     wam-djangobug@wamber.net
-    wangchun <yaohua2000@gmail.com>
+    Wang Chun <wangchun@exoweb.net>
     Filip Wasilewski <filip.wasilewski@gmail.com>
     Dan Watson <http://theidioteque.net/>
     Chris Wesseling <Chris.Wesseling@cwi.nl>
diff --git a/django/bin/compile-messages.py b/django/bin/compile-messages.py
index 2838cb8aa4..8693022644 100755
--- a/django/bin/compile-messages.py
+++ b/django/bin/compile-messages.py
@@ -14,7 +14,8 @@ def compile_messages(locale=None):
     basedirs = [os.path.join('conf', 'locale'), 'locale']
     if os.environ.get('DJANGO_SETTINGS_MODULE'):
         from django.conf import settings
-        basedirs += settings.LOCALE_PATHS
+        if hasattr(settings, 'LOCALE_PATHS'):
+            basedirs += settings.LOCALE_PATHS
 
     # Gather existing directories.
     basedirs = set(map(os.path.abspath, filter(os.path.isdir, basedirs)))