Also remove keys and values if message == "(null)"
i.e. if the conversion to string has already happened and the string is not NULL anymore (but a string that says so)
Actually fixes issue 1 :)