diff --git a/library/server/wsf/policy_driven/wsf_post_helper.e b/library/server/wsf/policy_driven/wsf_post_helper.e
index d6d42d0d..c2ffc068 100644
--- a/library/server/wsf/policy_driven/wsf_post_helper.e
+++ b/library/server/wsf/policy_driven/wsf_post_helper.e
@@ -62,6 +62,9 @@ feature {NONE} -- Implementation
 						a_handler.append_resource (req, res)
 						-- 200 or 204 or 303 or 500 (add support for this?)
 						-- FIXME: more support, such as includes_response_entity
+						if not a_handler.response_ok (req) then
+							write_error_response (req, res)
+						end
 					end
 				end
 			end
diff --git a/library/server/wsf/policy_driven/wsf_put_helper.e b/library/server/wsf/policy_driven/wsf_put_helper.e
index 93bf5921..bcf250de 100644
--- a/library/server/wsf/policy_driven/wsf_put_helper.e
+++ b/library/server/wsf/policy_driven/wsf_put_helper.e
@@ -62,6 +62,9 @@ feature {NONE} -- Implementation
 								a_handler.update_resource (req, res)
 								-- 204 or 500 (add support for this?)
 								-- FIXME: more support, such as includes_response_entity
+								if not a_handler.response_ok (req) then
+									write_error_response (req, res)
+								end
 							end
 						end
 					end