diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 705828131d..89c8ea9d6c 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -10,7 +10,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
@@ -41,7 +40,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
         private void load()
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
-            DrawableHitCircle drawableCircle = (DrawableHitCircle)drawableObject;
 
             InternalChildren = new Drawable[]
             {
@@ -95,7 +93,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     hitCircleSprite.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
                     hitCircleOverlay.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
 
-                    if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece).Value)
+                    if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece)?.Value ?? true)
                         hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
 
                     break;
diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 539b3d7d34..1303e2cace 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -125,7 +125,8 @@ namespace osu.Game.Rulesets.Osu.Skinning
                             break;
 
                         case OsuSkinConfiguration.ExpandNumberPiece:
-                            return SkinUtils.As<TValue>(new BindableBool(source.GetConfig<LegacySkinConfiguration, double>(LegacySkinConfiguration.LegacyVersion).Value < 2.0));
+                            double legacyVersion = source.GetConfig<LegacySkinConfiguration, double>(LegacySkinConfiguration.LegacyVersion)?.Value ?? 1.0;
+                            return SkinUtils.As<TValue>(new BindableBool(legacyVersion < 2.0));
                     }
 
                     break;
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 90265ec066..af5309eecd 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -74,9 +74,9 @@ namespace osu.Game.Skinning
                     switch (legacy)
                     {
                         case LegacySkinConfiguration.LegacyVersion:
-                            var versionString = GetConfig<string, string>("Version").Value;
+                            var versionString = GetConfig<string, string>("Version")?.Value ?? "1";
                             if (!double.TryParse(versionString, out double version))
-                                version = versionString == "latest" ? 2.7 : 1;
+                                version = versionString == "latest" ? 2.7 : 1.0;
 
                             return SkinUtils.As<TValue>(new BindableDouble(version));
                     }