Change message to be nullable