diff --git a/Tasking/Task.cpp b/Tasking/Task.cpp
index 49e81e5..9e204d6 100644
--- a/Tasking/Task.cpp
+++ b/Tasking/Task.cpp
@@ -167,8 +167,9 @@ namespace Tasking
         else
         {
             foreach (TCB *thread in Process->Threads)
-                if (thread->Status == Terminated)
-                    RemoveThread(thread);
+                if (!InvalidTCB(thread))
+                    if (thread->Status == Terminated)
+                        RemoveThread(thread);
         }
     }