Fix broken body field and add check before trying to populate user
field.