Added handling for missing sender value.