Handle the case where no command is specified.
Add extra checks in the body and header comparisons