diff --git a/webapp_search.py b/webapp_search.py
index 0001f8e2d..bc80379a6 100644
--- a/webapp_search.py
+++ b/webapp_search.py
@@ -108,8 +108,9 @@ def _matchSharedItem(searchStrLowerList: [],
     """
     for searchSubstr in searchStrLowerList:
         searchSubstr = searchSubstr.strip()
-        if searchSubstr in sharedItem['location'].lower():
-            return True
+        if sharedItem.get('location'):
+            if searchSubstr in sharedItem['location'].lower():
+                return True
         elif searchSubstr in sharedItem['summary'].lower():
             return True
         elif searchSubstr in sharedItem['displayName'].lower():
@@ -143,8 +144,9 @@ def _htmlSearchResultShare(sharedItem: {}, translate: {},
         '<b>' + translate['Type'] + ':</b> ' + sharedItem['itemType'] + ' '
     sharedItemsForm += \
         '<b>' + translate['Category'] + ':</b> ' + sharedItem['category'] + ' '
-    sharedItemsForm += \
-        '<b>' + translate['Location'] + ':</b> ' + sharedItem['location']
+    if sharedItem.get('location'):
+        sharedItemsForm += \
+            '<b>' + translate['Location'] + ':</b> ' + sharedItem['location']
     if sharedItem.get('itemPrice') and \
        sharedItem.get('itemCurrency'):
         if isfloat(sharedItem['itemPrice']):
diff --git a/webapp_timeline.py b/webapp_timeline.py
index 918f02fff..e96c2da0f 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -833,8 +833,9 @@ def htmlIndividualShare(actor: str, item: {}, translate: {},
         '<b>' + translate['Type'] + ':</b> ' + item['itemType'] + ' '
     profileStr += \
         '<b>' + translate['Category'] + ':</b> ' + item['category'] + ' '
-    profileStr += \
-        '<b>' + translate['Location'] + ':</b> ' + item['location']
+    if item.get('location'):
+        profileStr += \
+            '<b>' + translate['Location'] + ':</b> ' + item['location']
     if item.get('itemPrice') and item.get('itemCurrency'):
         if isfloat(item['itemPrice']):
             if float(item['itemPrice']) > 0: