diff --git a/src/main/java/org/springframework/samples/petclinic/rest/ExceptionControllerAdvice.java b/src/main/java/org/springframework/samples/petclinic/rest/ExceptionControllerAdvice.java
new file mode 100644
index 000000000..d4475e903
--- /dev/null
+++ b/src/main/java/org/springframework/samples/petclinic/rest/ExceptionControllerAdvice.java
@@ -0,0 +1,14 @@
+package org.springframework.samples.petclinic.rest;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+@ControllerAdvice
+public class ExceptionControllerAdvice {
+
+	@ExceptionHandler(Exception.class)
+	public ResponseEntity<Exception> exception(Exception e) {
+		return ResponseEntity.badRequest().body(e);
+	}
+}