Merge pull request #2355 from MediaBrowser/dev

add error handling

1 files changed, 8 insertions, 1 deletions

diff --git a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
index 2e39b038a..a31f0ed53 100644
--- a/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
@@ -80,7 +80,14 @@ namespace Emby.Server.Implementations.Data
                     AddColumn(db, "userdata", "SubtitleStreamIndex", "int", existingColumnNames);
                 }, TransactionMode);
 
-                ImportUserDataIfNeeded(connection);
+                try
+                {
+                    ImportUserDataIfNeeded(connection);
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error in ImportUserDataIfNeeded", ex);
+                }
             }
         }