diff --git a/loader/task.c b/loader/task.c
index bf383cd..345b9f7 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -14,6 +14,7 @@
 #include "debugger.h"
 #include "global.h"
 #include "instance.h"
+#include "message.h"
 #include "miscemu.h"
 #include "module.h"
 #include "neexe.h"
@@ -31,6 +32,7 @@
   /* Must not be greater than 64k, or MAKE_SEGPTR won't work */
 #define STACK32_SIZE 0x10000
 
+/* ------ Internal variables ------ */
 
 static HTASK hFirstTask = 0;
 static HTASK hCurrentTask = 0;
@@ -39,6 +41,8 @@
 static WORD nTaskCount = 0;
 static HANDLE hDOSEnvironment = 0;
 
+/* ------ Internal declarations ------ */
+
   /* TASK_Reschedule() 16-bit entry point */
 static FARPROC TASK_RescheduleProc;
 
@@ -48,7 +52,6 @@
 #define TASK_SCHEDULE()  CallTo16_word_(TASK_RescheduleProc,0)
 #endif
 
-
 static HANDLE TASK_CreateDOSEnvironment(void);
 
 /***********************************************************************
@@ -565,6 +568,10 @@
 
     GlobalFreeAll( pTask->hPDB );
 
+      /* Free message queue */
+
+    MSG_DeleteMsgQueue( pTask->hQueue );
+
       /* Free the selector aliases */
 
     GLOBAL_FreeBlock( pTask->hCSAlias );
@@ -604,8 +611,12 @@
     
     hTaskToKill = hCurrentTask;
     hLockedTask = 0;
+
     Yield();
-    /* We never return from Yield() */
+    /* We should never return from this Yield() */
+
+    fprintf(stderr,"It's alive! Alive!!!\n");
+    exit(1);
 }