Fixing of NPE on Spring 4.0 with Spring Boot
(cherry picked from commit 6732f8e0cfdfb57ecf087060753cbaa65129e892)