diff --git a/test/images/audit-proxy/Dockerfile b/test/images/audit-proxy/Dockerfile
index c5d927b07d1..7bbeb62b45d 100644
--- a/test/images/audit-proxy/Dockerfile
+++ b/test/images/audit-proxy/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2018 The Kubernetes Authors.
+# Copyright 2019 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/images/audit-proxy/Makefile b/test/images/audit-proxy/Makefile
index 3657cc57461..3f7976a459f 100644
--- a/test/images/audit-proxy/Makefile
+++ b/test/images/audit-proxy/Makefile
@@ -1,4 +1,4 @@
-# Copyright 2018 The Kubernetes Authors.
+# Copyright 2019 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/images/audit-proxy/main.go b/test/images/audit-proxy/main.go
index 4cfc7cb3da9..8438e5eda96 100644
--- a/test/images/audit-proxy/main.go
+++ b/test/images/audit-proxy/main.go
@@ -48,12 +48,16 @@ func main() {
 func handler(w http.ResponseWriter, req *http.Request) {
 	body, err := ioutil.ReadAll(req.Body)
 	if err != nil {
-		log.Fatalf("could not read request body: %v", err)
+		log.Printf("could not read request body: %v", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
 	}
 	el := &auditv1.EventList{}
 
 	if err := runtime.DecodeInto(decoder, body, el); err != nil {
-		log.Fatalf("failed decoding buf: %b, apiVersion: %s", body, auditv1.SchemeGroupVersion)
+		log.Printf("failed decoding buf: %b, apiVersion: %s", body, auditv1.SchemeGroupVersion)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
 	}
 	defer req.Body.Close()
 
@@ -61,9 +65,10 @@ func handler(w http.ResponseWriter, req *http.Request) {
 	for _, event := range el.Items {
 		err := encoder.Encode(&event, os.Stdout)
 		if err != nil {
-			log.Fatalf("could not encode audit event: %v", err)
+			log.Printf("could not encode audit event: %v", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
 		}
 	}
 	w.WriteHeader(http.StatusOK)
-	return
 }