DELTASPIKE-427 Leverage the null check better so that the message is at least logged.