diff --git a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
index 8398e4f137e..664ce42aa78 100644
--- a/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/owner/PetController.java
@@ -105,6 +105,11 @@ public String initCreationForm(Owner owner, ModelMap model) {
 	@PostMapping("/pets/new")
 	public String processCreationForm(Owner owner, @Valid Pet pet, BindingResult result,
 			RedirectAttributes redirectAttributes) {
+		// Validate empty name
+		if (!StringUtils.hasText(pet.getName())) {
+			result.rejectValue("name", "required", "Pet name must not be empty");
+			return VIEWS_PETS_CREATE_OR_UPDATE_FORM;
+		}
 
 		if (StringUtils.hasText(pet.getName()) && pet.isNew() && owner.getPet(pet.getName(), true) != null)
 			result.rejectValue("name", "duplicate", "already exists");