diff --git a/reactos/ntoskrnl/kd/gdbstub.c b/reactos/ntoskrnl/kd/gdbstub.c
index 17763fab161..4d34c30c3f8 100644
--- a/reactos/ntoskrnl/kd/gdbstub.c
+++ b/reactos/ntoskrnl/kd/gdbstub.c
@@ -1337,7 +1337,8 @@ KdEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
                     KeLowerIrql(OldIrql);
                   }
 
-                return kdHandleException;
+                KeContextToTrapFrame(Context, TrapFrame);
+                return ((SigVal == 5) ? (kdContinue) : (kdHandleException));
                 break;
               }
 
@@ -1411,7 +1412,9 @@ KdEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
         }
     }
 
-  return ((SigVal == 5) ? (kdContinue) : (kdHandleException));
+    /* not reached */
+    ASSERT(0);
+    return kdHandleException;
 }
 
 
diff --git a/reactos/ntoskrnl/ke/catch.c b/reactos/ntoskrnl/ke/catch.c
index fe5c3b5cc51..1f2f4d529b4 100644
--- a/reactos/ntoskrnl/ke/catch.c
+++ b/reactos/ntoskrnl/ke/catch.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: catch.c,v 1.52 2004/11/13 23:00:15 blight Exp $
+/* $Id: catch.c,v 1.53 2004/11/14 16:00:02 blight Exp $
  *
  * PROJECT:              ReactOS kernel
  * FILE:                 ntoskrnl/ke/catch.c
@@ -46,7 +46,7 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
 {
   EXCEPTION_DISPOSITION Value;
   CONTEXT TContext;
-  KD_CONTINUE_TYPE Action = kdContinue;
+  KD_CONTINUE_TYPE Action = kdHandleException;
 
   DPRINT("KiDispatchException() called\n");
 
@@ -166,10 +166,6 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
 	    }
 	}
     }
-  else
-    {
-      KeContextToTrapFrame (Context, KeGetCurrentThread()->TrapFrame);
-    }
 }
 
 /*