diff --git a/hypermedia/src/main/java/org/springframework/hateoas/examples/SupervisorController.java b/hypermedia/src/main/java/org/springframework/hateoas/examples/SupervisorController.java
index 5f9ad97..566cfc1 100644
--- a/hypermedia/src/main/java/org/springframework/hateoas/examples/SupervisorController.java
+++ b/hypermedia/src/main/java/org/springframework/hateoas/examples/SupervisorController.java
@@ -41,10 +41,12 @@ public ResponseEntity<EntityModel<Supervisor>> findOne(@PathVariable Long id) {
 
 		EntityModel<Manager> managerResource = controller.findOne(id).getBody();
 
-		EntityModel<Supervisor> supervisorResource = EntityModel.of( //
-				new Supervisor(managerResource.getContent()), //
-				managerResource.getLinks());
-
-		return ResponseEntity.ok(supervisorResource);
+		if (managerResource != null) {
+			EntityModel<Supervisor> supervisorResource = EntityModel.of( //
+					new Supervisor(managerResource.getContent()), //
+					managerResource.getLinks());
+			return ResponseEntity.ok(supervisorResource);
+		}
+		return ResponseEntity.notFound().build();
 	}
 }