diff --git a/lambdainst/views.py b/lambdainst/views.py
index c294c40..09a8c9b 100644
--- a/lambdainst/views.py
+++ b/lambdainst/views.py
@@ -301,7 +301,11 @@ def config(request):
 
 def api_locations(request):
     def format_loc(cc, l):
-        msg = ' [%s]' % l['message'] if l['message'] else ''
+        msg = ""
+        tags = l.get('tags', {})
+        message = tags.get('message')
+        if message:
+            msg = " [%s]" % message
         return {
             'country_name': l['country_name'] + msg,
             'country_code': cc,