diff --git a/src/servers/app/EventDispatcher.cpp b/src/servers/app/EventDispatcher.cpp
index c05b4d92da..44deb3b388 100644
--- a/src/servers/app/EventDispatcher.cpp
+++ b/src/servers/app/EventDispatcher.cpp
@@ -269,8 +269,9 @@ EventDispatcher::_Unset()
 
 	fStream->SendQuit();
 
-	wait_for_thread(fThread, NULL);
-	wait_for_thread(fCursorThread, NULL);
+	status_t status;
+	wait_for_thread(fThread, &status);
+	wait_for_thread(fCursorThread, &status);
 
 	fThread = fCursorThread = -1;
 
diff --git a/src/servers/app/EventStream.cpp b/src/servers/app/EventStream.cpp
index ffa0b006d6..6284c01060 100644
--- a/src/servers/app/EventStream.cpp
+++ b/src/servers/app/EventStream.cpp
@@ -213,13 +213,8 @@ InputServerStream::_MessageFromPort(BMessage** _message, bigtime_t timeout)
 	}
 
 	if (code == 'quit') {
-		// special code to tell our client to quit
-		BMessage* message = new BMessage(B_QUIT_REQUESTED);
-		if (message == NULL)
-			return B_NO_MEMORY;
-
-		*_message = message;
-		return B_OK;
+		// this will cause GetNextEvent() to return false
+		return B_BAD_PORT_ID;
 	}
 
 	// we have the message, now let's unflatten it