diff --git a/vm/os-windows-nt.c b/vm/os-windows-nt.c
index e425b6b94c..2b08d5f394 100755
--- a/vm/os-windows-nt.c
+++ b/vm/os-windows-nt.c
@@ -87,8 +87,7 @@ void c_to_factor_toplevel(CELL quot)
 	if(!AddVectoredExceptionHandler(0, (void*)exception_handler))
 		fatal_error("AddVectoredExceptionHandler failed", 0);
 	c_to_factor(quot);
-	if(!RemoveVectoredExceptionHandler((void*)exception_handler))
-		fatal_error("RemoveVectoredExceptionHandler failed", 0);
+	RemoveVectoredExceptionHandler((void*)exception_handler);
 }
 
 void open_console(void)
diff --git a/vm/platform.h b/vm/platform.h
index a3b7350b69..d5687b849d 100644
--- a/vm/platform.h
+++ b/vm/platform.h
@@ -72,7 +72,6 @@
 			#elif defined(FACTOR_ARM)
 				#include "os-linux-arm.h"
 			#elif defined(FACTOR_AMD64)
-				#include "os-unix-ucontext.h"
 				#include "os-linux-x86-64.h"
 			#else
 				#error "Unsupported Linux flavor"