Thanks for working this out. If only all troubles were presented in such a clear form :]
The development branch has a special function to check for whether a message field is empty or not - so this fix is only important for releases up to 8.2x; for that reason I'll go for a !=NULL check in that specific case.
