From 10ddc90fb83b5fdb4c06b696dd9f494766252bc6 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Sun, 18 Aug 2013 18:05:46 +0100
Subject: [PATCH] Avoid NPE in error controller

---
 .../springframework/boot/actuate/web/BasicErrorController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java
index 0c64466d066..4cda5f4d77d 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java
@@ -84,7 +84,7 @@ public class BasicErrorController implements ErrorController {
 			}
 			map.put("status", status);
 			if (error != null) {
-				while (error instanceof ServletException) {
+				while (error instanceof ServletException && error.getCause() != null) {
 					error = ((ServletException) error).getCause();
 				}
 				map.put("exception", error.getClass().getName());