--- a/src/protocols/novell/novell.c	Tue Mar 07 05:54:36 2006 +0000
+++ b/src/protocols/novell/novell.c	Tue Mar 07 07:17:39 2006 +0000
@@ -339,7 +339,7 @@
 			folder_name = nm_folder_get_name(folder);
 		}
 
-		if (*folder_name == '\0')
+		if (folder_name == NULL || *folder_name == '\0')
 			folder_name = NM_ROOT_FOLDER_NAME;
 
 		/* Re-add the buddy now that we got the okay from the server */