diff --git a/changelog.html b/changelog.html
index 5f013a77e9c0b7eae15985b1a72b903d3fe40300..f13a741844227d2e744e78465b5b0454ff9f5f58 100644
--- a/changelog.html
+++ b/changelog.html
@@ -67,6 +67,9 @@ Upcoming changes</a>
   <li class=bug>
     Jenkins didn't start on IBM JDK.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10810">issue 10810</a>)
+  <li class=bug>
+    Fixed a possible NPE during the boot sequence
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10799">issue 10799</a>)
   <li class=rfe>
     stdin/stdout based remote slaves, such as ones launched via SSH or script, now does a better redirect to avoid interference with JVM output to stdout.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-8856">issue 8856</a>)
diff --git a/core/pom.xml b/core/pom.xml
index 35ff031eef5f5dbe8238366b53afe4c5e9f739a7..6f77ce01d49820b2196901d95297235965e67397 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -42,7 +42,7 @@ THE SOFTWARE.
 
   <properties>
     <staplerFork>true</staplerFork>
-    <stapler.version>1.172</stapler.version>
+    <stapler.version>1.173</stapler.version>
   </properties>
 
   <dependencies>