Index: trunk/src/sh_prelude.c
===================================================================
--- trunk/src/sh_prelude.c	(revision 14)
+++ trunk/src/sh_prelude.c	(revision 15)
@@ -756,5 +756,5 @@
         prelude_string_t *str;
                 
-        if ( sh_class == STAMP)
+        if ( !client || sh_class == STAMP)
                 return 0;
         
@@ -872,5 +872,5 @@
 	(void) msgflags; /* fix compiler warning */
 
-        if ( initialized < 0 )
+        if ( initialized < 1 )
                 return -1;
         
@@ -920,4 +920,5 @@
                 return;
         prelude_client_destroy(client, PRELUDE_CLIENT_EXIT_STATUS_SUCCESS);
+	client = NULL;
         initialized = 0;
         return;