SEC-2574: Polish

Handle null DelegatingApplicationListener