diff --git a/plugin.video.amazon-test/resources/lib/web_api.py b/plugin.video.amazon-test/resources/lib/web_api.py
index 053c2b53..ee271f30 100644
--- a/plugin.video.amazon-test/resources/lib/web_api.py
+++ b/plugin.video.amazon-test/resources/lib/web_api.py
@@ -917,7 +917,7 @@ def ParseSinglePage(oid, o, bCacheRefresh, data=None, url=None):
                 bEpisodesOnly = oid == gti
                 siblings = [] if bEpisodesOnly else vd['siblings'][:]
                 siblings.append(gti)
-                siblings = sorted(siblings, key=(lambda k: self._videodata[k]['metadata']['videometa']['season']))
+                siblings = sorted(siblings, key=(lambda k: ((self._videodata.get(k) or {}).get('metadata') or {}).get('videometa', {}).get('season', 999)))
                 for gti in siblings:
                     # Add season if we're not inside a season already
                     if (not bEpisodesOnly) and (gti not in o):
@@ -1129,7 +1129,7 @@ def ParseSinglePage(oid, o, bCacheRefresh, data=None, url=None):
 
                 # Meta prep
                 if 'metadata' not in vd:
-                    vd['metadata'] = {'compactGTI': urn, 'artmeta': {}, 'videometa': {}}
+                    vd['metadata'] = {'compactGTI': urn if urn is not None else title_id, 'artmeta': {}, 'videometa': {}}
                     bUpdated = True
                 if 'artmeta' not in vd['metadata']:
                     vd['metadata']['artmeta'] = {}