Re-add logic to detect incorrect address types.