diff --git a/Dalamud/Game/ClientState/Condition.cs b/Dalamud/Game/ClientState/Conditions/Condition.cs
similarity index 94%
rename from Dalamud/Game/ClientState/Condition.cs
rename to Dalamud/Game/ClientState/Conditions/Condition.cs
index b416c4df4..5a4322532 100644
--- a/Dalamud/Game/ClientState/Condition.cs
+++ b/Dalamud/Game/ClientState/Conditions/Condition.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Dalamud.Game.ClientState
+namespace Dalamud.Game.ClientState.Conditions
 {
     /// <summary>
     /// Provides access to conditions (generally player state). You can check whether a player is in combat, mounted, etc.
@@ -37,7 +37,7 @@ namespace Dalamud.Game.ClientState
             {
                 var idx = (int)flag;
 
-                if (idx > MaxConditionEntries || idx < 0)
+                if (idx < 0 || idx >= MaxConditionEntries)
                     return false;
 
                 return *(bool*)(this.ConditionArrayBase + idx);
diff --git a/Dalamud/Game/ClientState/ConditionFlag.cs b/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs
similarity index 99%
rename from Dalamud/Game/ClientState/ConditionFlag.cs
rename to Dalamud/Game/ClientState/Conditions/ConditionFlag.cs
index dc3d72d61..75c295ed0 100644
--- a/Dalamud/Game/ClientState/ConditionFlag.cs
+++ b/Dalamud/Game/ClientState/Conditions/ConditionFlag.cs
@@ -1,4 +1,4 @@
-namespace Dalamud.Game.ClientState
+namespace Dalamud.Game.ClientState.Conditions
 {
     /// <summary>
     /// Possible state flags (or conditions as they're called internally) that can be set on the local client.