bug fix

web/app/solr.py

@@ -156,15 +156,16 @@ def parse_result(id, input):
 
     # search for the country in the content element and display it
     country_code = re.search('FT=D[^\s]*\s(\w{2})', input)
-    country = pycountry.countries.get(alpha_2=country_code.group(1))
-    if country is not None:
-        output['country'] = country
-    else:
-        country = pycountry.historic_countries.get(alpha_2=country_code.group(1))
+    if country_code is not None:
+        country = pycountry.countries.get(alpha_2=country_code.group(1))
         if country is not None:
             output['country'] = country
         else:
-            output['country'] = country_code.group(1)
+            country = pycountry.historic_countries.get(alpha_2=country_code.group(1))
+            if country is not None:
+                output['country'] = country
+            else:
+                output['country'] = country_code.group(1)
 
     output['raw'] = input