diff --git a/src/lib/components/sidebar/details/TeamView.svelte b/src/lib/components/sidebar/details/TeamView.svelte
index 5dcbcea8..bb5d25e5 100644
--- a/src/lib/components/sidebar/details/TeamView.svelte
+++ b/src/lib/components/sidebar/details/TeamView.svelte
@@ -88,7 +88,7 @@
 			<ModificationSection title="AX Skills" visible={true}>
 				{#each weapon.ax as axSkill}
 					<StatModifierItem
-						label={formatAxSkill(axSkill).split('+')[0].trim()}
+						label={formatAxSkill(axSkill).split('+')[0]?.trim() ?? ''}
 						value={`+${axSkill.strength}`}
 						suffix={axSkill.modifier <= 2 ? '' : '%'}
 						variant="enhanced"
diff --git a/src/lib/components/sidebar/modifications/MasteryDisplay.svelte b/src/lib/components/sidebar/modifications/MasteryDisplay.svelte
index cc45f379..9cf6ba05 100644
--- a/src/lib/components/sidebar/modifications/MasteryDisplay.svelte
+++ b/src/lib/components/sidebar/modifications/MasteryDisplay.svelte
@@ -46,7 +46,7 @@
 						{#if iconUrl}
 							<img
 								src={iconUrl}
-								alt={formatRingStat(ring.modifier, ring.strength, locale).split('+')[0].trim()}
+								alt={formatRingStat(ring.modifier, ring.strength, locale).split('+')[0]?.trim() ?? ''}
 								class="mastery-icon"
 							/>
 						{/if}
@@ -54,7 +54,7 @@
 					<span class="mastery-content">
 						{#if variant === 'detailed'}
 							<strong class="mastery-label">
-								{formatRingStat(ring.modifier, ring.strength, locale).split('+')[0].trim()}
+								{formatRingStat(ring.modifier, ring.strength, locale).split('+')[0]?.trim() ?? ''}
 							</strong>
 							<span class="mastery-value">
 								+{ring.strength}{getRingStat(ring.modifier)?.suffix || ''}
@@ -81,7 +81,7 @@
 					{#if iconUrl}
 						<img
 							src={iconUrl}
-							alt={formatEarringStat(earring.modifier, earring.strength, locale, characterElement).split('+')[0].trim()}
+							alt={formatEarringStat(earring.modifier, earring.strength, locale, characterElement).split('+')[0]?.trim() ?? ''}
 							class="mastery-icon"
 						/>
 					{/if}
@@ -89,7 +89,7 @@
 				<span class="mastery-content">
 					{#if variant === 'detailed'}
 						<strong class="mastery-label">
-							{formatEarringStat(earring.modifier, earring.strength, locale, characterElement).split('+')[0].trim()}
+							{formatEarringStat(earring.modifier, earring.strength, locale, characterElement).split('+')[0]?.trim() ?? ''}
 						</strong>
 						<span class="mastery-value enhanced">
 							+{earring.strength}{getElementalizedEarringStat(earring.modifier, characterElement, locale)?.suffix || ''}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 2e5253e2..7b066550 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -58,10 +58,11 @@
 
 	// Handle scroll restoration or reset after navigation
 	afterNavigate(({ from, to, type }) => {
-		if (!mainContent) return;
+		if (!mainContent || !to) return;
 
 		// Use requestAnimationFrame to ensure DOM has updated
 		requestAnimationFrame(() => {
+			if (!mainContent) return;
 			const key = to.url.pathname + to.url.search;
 
 			// Only restore scroll for browser back/forward navigation