--- a/src/util/threads-win32.c	2012-04-06 19:19:54 +0000
+++ b/src/util/threads-win32.c	2012-04-06 19:23:00 +0000
@@ -316,8 +316,11 @@
 void virThreadSelf(virThreadPtr thread)
 {
     virThreadPtr self = TlsGetValue(selfkey);
-    thread->thread = self->thread;
-    thread->joinable = self->joinable;
+	
+	if (self) {
+		thread->thread = self->thread;
+		thread->joinable = self->joinable;
+	}
 }
 
 bool virThreadIsSelf(virThreadPtr thread)

--- a/src/util/util.c	2012-04-06 19:31:46 +0000
+++ b/src/util/util.c	2012-04-06 19:31:49 +0000
@@ -269,7 +269,7 @@
 
 int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED)
 {
-    return -1;
+    return 0;
 }
 
 #endif /* WIN32 */