diff --git a/resources/lib/initialsetup.py b/resources/lib/initialsetup.py
index 354375ab..58b9f1bb 100644
--- a/resources/lib/initialsetup.py
+++ b/resources/lib/initialsetup.py
@@ -95,11 +95,7 @@ class InitialSetup(object):
 
         if settings('server'):
             current_state = self.connectmanager.get_state()
-            if current_state['State'] == STATE['ConnectSignIn']:
-                # Failed to identify server
-                return True
-
-            elif 'Servers' in current_state:
+            try:
                 for server in current_state['Servers']:
                     if server['Id'] == settings('serverId'):
                         # Update token
@@ -110,6 +106,8 @@ class InitialSetup(object):
                         server_address = self.connectmanager.get_address(server)
                         self._set_server(server_address, server)
                         log.info("Found server!")
+            except Exception as error:
+                log.error(error)
             
             return True
 
diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py
index 2c0ed3b3..74ee777e 100644
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@@ -396,7 +396,7 @@ class LibrarySync(threading.Thread):
 
         # Get views
         result = self.doUtils("{server}/emby/Users/{UserId}/Views?format=json")
-        grouped_views = result['Items']
+        grouped_views = result['Items'] if 'Items' in result else []
         ordered_views = self.emby.getViews(sortedlist=True)
         all_views = []
         sorted_views = []
@@ -830,8 +830,11 @@ class LibrarySync(threading.Thread):
         # It returns True is database is up to date. False otherwise.
         log.info("current: %s minimum: %s" % (current, minimum))
 
-        currMajor, currMinor, currPatch = current.split(".")
-        minMajor, minMinor, minPatch = minimum.split(".")
+        try:
+            currMajor, currMinor, currPatch = current.split(".")
+            minMajor, minMinor, minPatch = minimum.split(".")
+        except ValueError as error:
+            raise ValueError("Unable to compare versions: %s, %s" % (current, minimum))
 
         if currMajor > minMajor:
             return True
diff --git a/resources/lib/utils.py b/resources/lib/utils.py
index 01413d38..8a8d3c97 100644
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@@ -421,7 +421,7 @@ def reset():
             cursor.execute("DELETE FROM " + tablename)
     cursor.execute('DROP table IF EXISTS emby')
     cursor.execute('DROP table IF EXISTS view')
-    cursor.execute("DELETE FROM version")
+    cursor.execute("DROP table IF EXISTS version")
     connection.commit()
     cursor.close()
 
diff --git a/resources/lib/videonodes.py b/resources/lib/videonodes.py
index 5a140e88..3a9a4640 100644
--- a/resources/lib/videonodes.py
+++ b/resources/lib/videonodes.py
@@ -62,9 +62,13 @@ class VideoNodes(object):
 
         # Verify the video directory
         if not xbmcvfs.exists(path):
-            shutil.copytree(
-                src=xbmc.translatePath("special://xbmc/system/library/video").decode('utf-8'),
-                dst=xbmc.translatePath("special://profile/library/video").decode('utf-8'))
+            try:
+                shutil.copytree(
+                    src=xbmc.translatePath("special://xbmc/system/library/video").decode('utf-8'),
+                    dst=xbmc.translatePath("special://profile/library/video").decode('utf-8'))
+            except Exception as error:
+                log.error(error)
+
             xbmcvfs.exists(path)
 
         if delete: