diff --git a/default.py b/default.py
index fdecf1a4..3205abf2 100644
--- a/default.py
+++ b/default.py
@@ -27,7 +27,8 @@ except:
     id=None
 
 if  mode != None and mode == "play":
-    xbmcplugin.endOfDirectory(int(sys.argv[1]),True,False,True)
+    listItem = xbmcgui.ListItem(path="")
+    xbmcplugin.setResolvedUrl (int(sys.argv[1]), True, listItem)
     WINDOW.setProperty('GUIPLAY', str(id)) # set window prop
 elif sys.argv[1] == "reset":
     utils.reset()
diff --git a/resources/lib/Player.py b/resources/lib/Player.py
index d1de762b..d82a86ef 100644
--- a/resources/lib/Player.py
+++ b/resources/lib/Player.py
@@ -204,7 +204,11 @@ class Player( xbmc.Player ):
         self.stopAll()
         
         if xbmcplayer.isPlaying():
-            currentFile = xbmcplayer.getPlayingFile()
+            
+            currentFile = ""
+            try:
+                currentFile = xbmcplayer.getPlayingFile()
+            except: pass
             self.logMsg("onPlayBackStarted: %s" % currentFile, 0)
             
             # we may need to wait until the info is available