After the recent changes to message filtering, it can happen that data->message is NULL when we get here. (cherry picked from commit fe1186a8)