diff --git a/xqf/src/srv-list.c b/xqf/src/srv-list.c
index 3e4f2fe..5a1f0e1 100644
--- a/xqf/src/srv-list.c
+++ b/xqf/src/srv-list.c
@@ -339,6 +339,9 @@ void player_clist_redraw (void) {
 void server_clist_sync_selection (void) {
   GList *selection;
 
+  if(!server_clist)
+      return;
+
   debug (7, "server_clist_sync_selection() --");
   if (!sync_selection_blocked) {
     selection = server_clist->selection;
@@ -450,13 +453,18 @@ GSList *server_clist_all_servers (void) {
 
 
 void server_clist_selection_visible (void) {
-  GList *rows = server_clist->selection;
+  GList *rows;
   GList *row;
   GtkVisibility vis;
   int min;
 
   debug (7, "server_clist_selection_visible() -- ");
 
+  if(!server_clist)
+      return;
+
+  rows = server_clist->selection;
+
   if (!rows)
     return;