Now removes null variables from messages on entry