Index: src/Libraries/Mono.Media/Media.Playlists.Xspf/Playlist.cs
===================================================================
--- src/Libraries/Mono.Media/Media.Playlists.Xspf/Playlist.cs	(revision 4852)
+++ src/Libraries/Mono.Media/Media.Playlists.Xspf/Playlist.cs	(working copy)
@@ -191,10 +191,7 @@
         public Uri DefaultBaseUri {
             get { 
                 if(default_base_uri == null) {
-                    string path = Path.GetFullPath(Environment.CurrentDirectory);
-                    if(path == null) {
-                        path = System.Reflection.Assembly.GetEntryAssembly().Location;
-                    }
+                    string path = System.Reflection.Assembly.GetEntryAssembly().Location;
                     path = Path.GetFullPath(path);
                     default_base_uri = new Uri(path);
                 }
