diff --git a/library/server/wsf/src/service/wsf_to_wgi_service.e b/library/server/wsf/src/service/wsf_to_wgi_service.e
index f39295f7..e78a8fa0 100644
--- a/library/server/wsf/src/service/wsf_to_wgi_service.e
+++ b/library/server/wsf/src/service/wsf_to_wgi_service.e
@@ -42,6 +42,9 @@ feature {WGI_CONNECTOR} -- Implementation: Execution
 			w_req.destroy
 		rescue
 			if w_res /= Void then
+				if not (w_res.status_committed or w_res.header_committed) then
+					w_res.set_status_code ({HTTP_STATUS_CODE}.internal_server_error)
+				end
 				w_res.flush
 			end
 			if w_req /= Void then