remove NullMessage, see #3281