diff -uNr audacious-1.5.1-orig/src/audacious/playlist.c audacious-1.5.1/src/audacious/playlist.c
--- audacious-1.5.1-orig/src/audacious/playlist.c	2008-05-24 00:00:34.000000000 +0200
+++ audacious-1.5.1/src/audacious/playlist.c	2009-05-01 19:29:17.663254934 +0200
@@ -1531,6 +1531,9 @@
 gint
 playlist_get_length(Playlist *playlist)
 {
+
+    g_return_val_if_fail(playlist != NULL, 0);
+
     return g_list_length(playlist->entries);
 }