Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta

1 files changed, 9 insertions, 1 deletions

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index a76ab9f07..6a92533ed 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -252,7 +252,15 @@ namespace MediaBrowser.Common.Implementations
             var innerProgress = new ActionableProgress<double>();
             innerProgress.RegisterAction(p => progress.Report(.8 * p + 15));
 
-            await RegisterResources(innerProgress).ConfigureAwait(false);
+            try
+            {
+                await RegisterResources(innerProgress).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error in RegisterResource", ex);
+                throw;
+            }
 
             FindParts();
             progress.Report(95);