diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e603375e9c..4745733bd9 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -109,7 +109,7 @@ namespace osu.Game
             dependencies.Cache(this);
 
             configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
-            Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value);
+            Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();
             Ruleset.ValueChanged += r => configRuleset.Value = r.ID ?? 0;
         }
 
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 7b26e50dd8..e129a81116 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -224,8 +224,8 @@ namespace osu.Game.Rulesets.Scoring
             OnNewJudgement(judgement);
             updateScore();
 
-            NotifyNewJudgement(judgement);
             UpdateFailed();
+            NotifyNewJudgement(judgement);
         }
 
         protected void RemoveJudgement(Judgement judgement)