diff --git a/php/footer.php b/php/footer.php
index 87fca13f..5c5da38f 100755
--- a/php/footer.php
+++ b/php/footer.php
@@ -74,7 +74,6 @@
     });
 </script>
 
-
 <script type="text/javascript" src="/static/js/list.js"></script>
 <script type="text/javascript" src="/static/js/searchlist.js"></script>
 <script type="text/javascript" src="/static/js/playercontrols.js"></script>
@@ -83,4 +82,4 @@
 <script type="text/javascript" src="/static/js/admin.js"></script>
 <script type="text/javascript" src="/static/js/chat.js"></script>
 <script type="text/javascript" src="/static/js/hostcontroller.js"></script>
-<!--<script type="text/javascript" src="/static/js/remotecontroller.js"></script>-->
\ No newline at end of file
+<!--<script type="text/javascript" src="/static/js/remotecontroller.js"></script>-->
diff --git a/static/js/youtube.js b/static/js/youtube.js
index 2bbde652..5710a6fc 100755
--- a/static/js/youtube.js
+++ b/static/js/youtube.js
@@ -268,7 +268,7 @@ function errorHandler(newState)
 	var failsafe = ytplayer.getVideoUrl().split("https://www.youtube.com/watch");
 	if(newState.data == 5 || newState.data == 100 || newState.data == 101 || newState.data == 150)
 			socket.emit("skip", newState.data);
-	else
+	else if(video_id !== undefined)
 			ytplayer.loadVideoById(video_id);
 }