handle null body
Listen for TE removal