Merge pull request #1766 from MediaBrowser/dev

Dev

1 files changed, 11 insertions, 2 deletions

diff --git a/MediaBrowser.ServerApplication/Native/SqliteExtensions.cs b/MediaBrowser.ServerApplication/Native/SqliteExtensions.cs
index 1cde2ea13..4e6c82495 100644
--- a/MediaBrowser.ServerApplication/Native/SqliteExtensions.cs
+++ b/MediaBrowser.ServerApplication/Native/SqliteExtensions.cs
@@ -54,9 +54,18 @@ namespace MediaBrowser.ServerApplication.Native
             _logger = logger;
         }
 
-        public Task<IDbConnection> Connect(string dbPath)
+        public async Task<IDbConnection> Connect(string dbPath)
         {
-            return SqliteExtensions.ConnectToDb(dbPath, _logger);
+            try
+            {
+                return await SqliteExtensions.ConnectToDb(dbPath, _logger).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error opening database {0}", ex, dbPath);
+
+                throw;
+            }
         }
     }
 }
\ No newline at end of file