diff --git a/CodeAnalysis/osu.ruleset b/CodeAnalysis/osu.ruleset
index 61e6520beb..b82799fea4 100644
--- a/CodeAnalysis/osu.ruleset
+++ b/CodeAnalysis/osu.ruleset
@@ -57,4 +57,7 @@
     <Rule Id="CA2213" Action="None" />
     <Rule Id="CA2235" Action="None" />
   </Rules>
+  <Rules AnalyzerId="Microsoft.NetCore.CSharp.Analyzers" RuleNamespace="Microsoft.NetCore.CSharp.Analyzers">
+    <Rule Id="CA2201" Action="Warning" />
+  </Rules>
 </RuleSet>
\ No newline at end of file
diff --git a/osu.Game.Tests/Visual/TestSceneOsuGame.cs b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
index e495b2a95a..492494ada3 100644
--- a/osu.Game.Tests/Visual/TestSceneOsuGame.cs
+++ b/osu.Game.Tests/Visual/TestSceneOsuGame.cs
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual
                 foreach (var type in requiredGameDependencies)
                 {
                     if (game.Dependencies.Get(type) == null)
-                        throw new Exception($"{type} has not been cached");
+                        throw new InvalidOperationException($"{type} has not been cached");
                 }
 
                 return true;
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Visual
                 foreach (var type in requiredGameBaseDependencies)
                 {
                     if (gameBase.Dependencies.Get(type) == null)
-                        throw new Exception($"{type} has not been cached");
+                        throw new InvalidOperationException($"{type} has not been cached");
                 }
 
                 return true;
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index b424e0f086..fcbd4d314a 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -122,7 +122,7 @@ namespace osu.Game.Online.API
                     // attempt to decode a displayable error string.
                     var error = JsonConvert.DeserializeObject<DisplayableError>(responseString);
                     if (error != null)
-                        e = new Exception(error.ErrorMessage, e);
+                        e = new APIException(error.ErrorMessage, e);
                 }
                 catch
                 {
@@ -154,6 +154,14 @@ namespace osu.Game.Online.API
         }
     }
 
+    public class APIException : InvalidOperationException
+    {
+        public APIException(string messsage, Exception innerException)
+            : base(messsage, innerException)
+        {
+        }
+    }
+
     public delegate void APIFailureHandler(Exception e);
 
     public delegate void APISuccessHandler();
diff --git a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs b/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
index d47caf409b..3cab04d904 100644
--- a/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
+++ b/osu.Game/Rulesets/Difficulty/Utils/LimitedCapacityStack.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Difficulty.Utils
             get
             {
                 if (i < 0 || i > Count - 1)
-                    throw new IndexOutOfRangeException();
+                    throw new ArgumentOutOfRangeException(nameof(i));
 
                 i += marker;
                 if (i > capacity - 1)