diff --git a/src/WINNT/client_osi/osilog.c b/src/WINNT/client_osi/osilog.c
index 81a8ca54b7..8d4d566865 100644
--- a/src/WINNT/client_osi/osilog.c
+++ b/src/WINNT/client_osi/osilog.c
@@ -255,6 +255,10 @@ char *osi_LogSaveString(osi_log_t *logp, char *s)
 {
 	char *saveplace;
 
+        if (!logp) return s;
+
+        if (!logp->enabled) return s;
+
 	if (s == NULL) return NULL;
 
         thrd_EnterCrit(&logp->cs);