diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
index a93002fecd4..d53dfb718c5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
@@ -79,9 +79,9 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
 				this.applicationContext.publishEvent(new DataSourceInitializedEvent(
 						this.dataSource));
 			}
-			catch (IllegalStateException e) {
+			catch (IllegalStateException ex) {
 				logger.warn("Could not send event to complete DataSource initialization ("
-						+ e.getMessage() + ")");
+						+ ex.getMessage() + ")");
 			}
 		}
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/web/ErrorPageFilter.java b/spring-boot/src/main/java/org/springframework/boot/context/web/ErrorPageFilter.java
index e92dbd67a2c..1f58bf84da8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/web/ErrorPageFilter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/web/ErrorPageFilter.java
@@ -136,18 +136,22 @@ class ErrorPageFilter extends AbstractConfigurableEmbeddedServletContainer imple
 		request.setAttribute(ERROR_EXCEPTION, ex);
 		request.setAttribute(ERROR_EXCEPTION_TYPE, type.getName());
 		wrapped.sendError(500, ex.getMessage());
-		if (!wrapped.isCommitted()) {
-			wrapped.reset();
-			request.getRequestDispatcher(errorPath).forward(request, wrapped);
-		}
-		else {
-			String message = "Cannot forward to error page for"
-					+ request.getRequestURI()
-					+ " (response is committed), so this response may have the wrong status code";
-			logger.error(message);
+		forwardToErrorPage(errorPath, request, wrapped);
+	}
+
+	private void forwardToErrorPage(String path, HttpServletRequest request,
+			ServletResponse response) throws ServletException, IOException {
+		if (!response.isCommitted()) {
+			String message = "Cannot forward to error page for" + request.getRequestURI()
+					+ " (response is committed), so this response may have "
+					+ "the wrong status code";
 			// User might see the error page without all the data here but the exception
 			// isn't going to help anyone (and it's already been logged)
+			logger.error(message);
+			return;
 		}
+		response.reset();
+		request.getRequestDispatcher(path).forward(request, response);
 	}
 
 	private String getErrorPath(Map<Integer, String> map, Integer status) {