diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json
index 8119ebcf41..9e650790be 100644
--- a/dashboard-ui/bower_components/iron-meta/.bower.json
+++ b/dashboard-ui/bower_components/iron-meta/.bower.json
@@ -25,14 +25,14 @@
     "web-component-tester": "*",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/polymerelements/iron-meta",
+  "homepage": "https://github.com/PolymerElements/iron-meta",
   "_release": "1.0.3",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.3",
     "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
   },
-  "_source": "git://github.com/polymerelements/iron-meta.git",
+  "_source": "git://github.com/PolymerElements/iron-meta.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-meta"
+  "_originalSource": "PolymerElements/iron-meta"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json b/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json
index ea16ce655c..5f4ff261de 100644
--- a/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json
+++ b/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json
@@ -34,14 +34,14 @@
     "web-component-tester": "*",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/polymerelements/iron-overlay-behavior",
+  "homepage": "https://github.com/PolymerElements/iron-overlay-behavior",
   "_release": "1.0.5",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.5",
     "commit": "f03cea265587c724cf3a85aef76b2ab7ccfd2b94"
   },
-  "_source": "git://github.com/polymerelements/iron-overlay-behavior.git",
+  "_source": "git://github.com/PolymerElements/iron-overlay-behavior.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-overlay-behavior"
+  "_originalSource": "PolymerElements/iron-overlay-behavior"
 }
\ No newline at end of file
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 67f87a12e4..1f2b6f6bd5 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -946,17 +946,15 @@
                 // This will start the transcoding process before actually feeding the video url into the player
                 if ($.browser.safari && !mediaSource.RunTimeTicks) {
 
-                    Dashboard.showLoadingMsg();
+                    Dashboard.showModalLoadingMsg();
 
                     ApiClient.ajax({
                         type: 'GET',
                         url: streamInfo.url.replace('master.m3u8', 'live.m3u8')
-                    }).always(function () {
-
-                        Dashboard.hideLoadingMsg();
-
                     }).done(function () {
                         self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback);
+                    }).fail(function() {
+                        Dashboard.hideModalLoadingMsg();
                     });
 
                 } else {
@@ -1059,6 +1057,8 @@
 
             }).one("playing.mediaplayerevent", function () {
 
+                Dashboard.hideModalLoadingMsg();
+
                 // For some reason this is firing at the start, so don't bind until playback has begun
                 $(this).on("ended", self.onPlaybackStopped).one('ended', self.playNextAfterEnded);
 
@@ -1091,6 +1091,7 @@
 
             }).on("error.mediaplayerevent", function () {
 
+                Dashboard.hideModalLoadingMsg();
                 self.stop();
 
                 var errorMsg = Globalize.translate('MessageErrorPlayingVideo');
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 42138b5586..86f6233acb 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1018,7 +1018,6 @@
 
         function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) {
 
-            Dashboard.hideModalLoadingMsg();
 
             self.currentMediaSource = mediaSource;
             self.currentItem = item;
@@ -1031,6 +1030,7 @@
 
             } else if (item.MediaType === "Audio") {
 
+                Dashboard.hideModalLoadingMsg();
                 playAudio(item, self.currentMediaSource, startPosition, callback);
             }
         }