diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp
index 21fb7926..b8081626 100644
--- a/noatun/library/downloader.cpp
+++ b/noatun/library/downloader.cpp
@@ -86,6 +86,7 @@ void Downloader::start()
 
 	for (TQPtrListIterator<Downloader::QueueItem> i(*mUnstartedQueue); i.current(); ++i)
 	{
+		if((*i)->file.path().isEmpty())	continue;
 		(*i)->notifier->mLocalFilename = (*i)->local;
 		mQueue.append(*i);
 		emit enqueued((*i)->notifier, (*i)->file);
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index bfdd0112..b7481125 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -797,6 +797,9 @@ void View::init()
 		list->openGlobal(internalURL);
 	}
 
+	for(PlaylistItem item = SPL->getFirst(); item; item = SPL->getAfter(item))
+	    if(item.url().path().isEmpty()) item.remove();
+
 	TDEConfig &config = *TDEGlobal::config();
 	config.setGroup("splitplaylist");