Fix TypeError with AdvancedSettings.xml missing

- Fixes #290

resources/lib/initialsetup.py

@@ -401,12 +401,13 @@ class InitialSetup():
         dialog = self.dialog
 
         # Get current Kodi video cache setting
-        cache, _ = advancedsettings_xml(['cache', 'memorysize'])
-        if cache is not None:
-            cache = str(cache.text)
-        else:
+        try:
+            cache, _ = advancedsettings_xml(['cache', 'memorysize'])
+        except TypeError:
             # Kodi default cache
             cache = '20971520'
+        else:
+            cache = str(cache.text)
         log.info('Current Kodi video memory cache in bytes: %s' % cache)
         settings('kodi_video_cache', value=cache)
 

resources/lib/music.py

@@ -21,8 +21,9 @@ def get_current_music_folders():
     excludefromscan music folders in the advancedsettings.xml
     """
     paths = []
-    root, _ = advancedsettings_xml(['audio', 'excludefromscan'])
-    if root is None:
+    try:
+        root, _ = advancedsettings_xml(['audio', 'excludefromscan'])
+    except TypeError:
         return paths
 
     for element in root: