DELTASPIKE-354 prevent NPE when passing null to a @MessageBundle
DELTASPIKE-363 prevent NPE at shutdown