This commit makes handling of stanzas that could not be delivered uniform,
in regards to logging. Other than log levels and messages, this commit does
not make a functional change.