diff --git a/reactos/ntoskrnl/rtl/error.c b/reactos/ntoskrnl/rtl/error.c
index dd40bf640bb..07bcef5c8f6 100644
--- a/reactos/ntoskrnl/rtl/error.c
+++ b/reactos/ntoskrnl/rtl/error.c
@@ -1,4 +1,4 @@
-/* $Id: error.c,v 1.11 2004/02/28 15:12:49 navaraf Exp $
+/* $Id: error.c,v 1.12 2004/05/15 16:17:59 gvg Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -840,11 +840,23 @@ RtlAssert(PVOID FailedAssertion,
 	  ULONG LineNumber,
 	  PCHAR Message)
 {
-   DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n",
-	    (PCHAR)FailedAssertion,
-	    (PCHAR)FileName,
-	    LineNumber,
-	    Message);
+   if (NULL == Message)
+      {
+         DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n",
+                  (PCHAR)FailedAssertion,
+                  (PCHAR)FileName,
+                  LineNumber,
+                  Message);
+      }
+   else
+      {
+         DbgPrint("Assertion \'%s\' failed at %s line %d\n",
+                  (PCHAR)FailedAssertion,
+                  (PCHAR)FileName,
+                  LineNumber);
+      }
+
+   DbgBreakPoint();
 }
 
 
diff --git a/reactos/subsys/win32k/ntuser/msgqueue.c b/reactos/subsys/win32k/ntuser/msgqueue.c
index 5f9b8d8a065..6a9c218faed 100644
--- a/reactos/subsys/win32k/ntuser/msgqueue.c
+++ b/reactos/subsys/win32k/ntuser/msgqueue.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: msgqueue.c,v 1.95 2004/05/14 23:57:32 weiden Exp $
+/* $Id: msgqueue.c,v 1.96 2004/05/15 16:17:59 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -145,7 +145,7 @@ MsqInsertSystemMessage(MSG* Msg)
     while (mmov != SystemMessageQueueHead )
     {
       ULONG prev = mmov ? mmov - 1 : SYSTEM_MESSAGE_QUEUE_SIZE - 1;
-      ASSERT(mmov >= 0);
+      ASSERT((LONG) mmov >= 0);
       ASSERT(mmov < SYSTEM_MESSAGE_QUEUE_SIZE);
       SystemMessageQueue[mmov] = SystemMessageQueue[prev];
       mmov = prev;
diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsys/win32k/w32k.h
index ceb5e53a0a3..106e677cf1e 100644
--- a/reactos/subsys/win32k/w32k.h
+++ b/reactos/subsys/win32k/w32k.h
@@ -5,6 +5,7 @@
 #define __WIN32K__
 #define NTOS_MODE_KERNEL
 
+#include <roscfg.h>
 #include <roskrnl.h>
 
 #include <ddk/winddi.h>