diff --git a/.idea/.idea.Alibi/.idea/contentModel.xml b/.idea/.idea.Alibi/.idea/contentModel.xml
index fddbd67..b2e8ae4 100644
--- a/.idea/.idea.Alibi/.idea/contentModel.xml
+++ b/.idea/.idea.Alibi/.idea/contentModel.xml
@@ -68,7 +68,6 @@
       </e>
       <e p="Alibi.Plugins.API" t="IncludeRecursive">
         <e p="Alibi.Plugins.API.csproj" t="IncludeRecursive" />
-        <e p="Alibi.Plugins.API.csproj~RF2be577f.TMP" t="Include" />
         <e p="AreaUpdateType.cs" t="Include" />
         <e p="Attributes" t="Include">
           <e p="CommandHandlerAttribute.cs" t="Include" />
diff --git a/.idea/.idea.Alibi/.idea/workspace.xml b/.idea/.idea.Alibi/.idea/workspace.xml
index 1cfbd75..c307a59 100644
--- a/.idea/.idea.Alibi/.idea/workspace.xml
+++ b/.idea/.idea.Alibi/.idea/workspace.xml
@@ -23,12 +23,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="eb983bd1-6298-4db3-b5d9-712dc4692a1d" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Alibi.Plugins.Cerberus/Alibi.Plugins.Cerberus.csproj" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Alibi.Plugins.Cerberus/CerberusConfiguration.cs" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Alibi.Plugins.Cerberus/MainPlugin.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.idea.Alibi/.idea/contentModel.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Alibi/.idea/contentModel.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.Alibi/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Alibi/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Alibi.sln" beforeDir="false" afterPath="$PROJECT_DIR$/Alibi.sln" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Alibi/Protocol/MessageHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Alibi/Protocol/MessageHandler.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Alibi/Protocol/Messages.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Alibi/Protocol/Messages.cs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,17 +59,18 @@
         <option value="$PROJECT_DIR$/Alibi/Commands/CommandHandler.cs" />
         <option value="$PROJECT_DIR$/Alibi/Configuration.cs" />
         <option value="$PROJECT_DIR$/Alibi/Protocol/IcValidator.cs" />
-        <option value="$PROJECT_DIR$/Alibi/Protocol/MessageHandler.cs" />
         <option value="$PROJECT_DIR$/Alibi/WebSocket/WebSocketSession.cs" />
         <option value="$PROJECT_DIR$/Alibi/ClientSession.cs" />
         <option value="$PROJECT_DIR$/Alibi/WebSocket/TcpProxy.cs" />
-        <option value="$PROJECT_DIR$/Alibi/Protocol/Messages.cs" />
         <option value="$PROJECT_DIR$/Alibi.Plugins.Webhook/DiscordWebhook.cs" />
         <option value="$PROJECT_DIR$/Alibi/Server.cs" />
         <option value="$PROJECT_DIR$/Alibi/Client.cs" />
         <option value="$PROJECT_DIR$/Alibi.Plugins.Cerberus/Class1.cs" />
         <option value="$PROJECT_DIR$/Alibi.Plugins.Cerberus/MainPlugin.cs" />
         <option value="$PROJECT_DIR$/Alibi.Plugins.Cerberus/CerberusConfiguration.cs" />
+        <option value="$PROJECT_DIR$/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs" />
+        <option value="$PROJECT_DIR$/Alibi/Protocol/MessageHandler.cs" />
+        <option value="$PROJECT_DIR$/Alibi/Protocol/Messages.cs" />
       </list>
     </option>
   </component>
@@ -150,6 +149,7 @@
       <workItem from="1602831243848" duration="1334000" />
       <workItem from="1602832632746" duration="12550000" />
       <workItem from="1602869966629" duration="4257000" />
+      <workItem from="1602915313708" duration="1072000" />
     </task>
     <servers />
   </component>
@@ -187,22 +187,22 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="770" height="464" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1602870685873" />
-    <state width="1493" height="166" key="GridCell.Tab.0.bottom" timestamp="1602901129320">
+    <state width="1493" height="166" key="GridCell.Tab.0.bottom" timestamp="1602954176163">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="166" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602901129320" />
-    <state width="1493" height="166" key="GridCell.Tab.0.center" timestamp="1602901129320">
+    <state width="1493" height="166" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602954176163" />
+    <state width="1493" height="166" key="GridCell.Tab.0.center" timestamp="1602954176163">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="166" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602901129320" />
-    <state width="1493" height="166" key="GridCell.Tab.0.left" timestamp="1602901129320">
+    <state width="1493" height="166" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602954176163" />
+    <state width="1493" height="166" key="GridCell.Tab.0.left" timestamp="1602954176163">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="166" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602901129320" />
-    <state width="1493" height="166" key="GridCell.Tab.0.right" timestamp="1602901129320">
+    <state width="1493" height="166" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602954176163" />
+    <state width="1493" height="166" key="GridCell.Tab.0.right" timestamp="1602954176163">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="166" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602901129320" />
+    <state width="1493" height="166" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602954176163" />
     <state width="1493" height="166" key="GridCell.Tab.1.bottom" timestamp="1602901129321">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
diff --git a/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs b/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs
index 0379dd5..0b65e1a 100644
--- a/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs
+++ b/Alibi.Plugins.API/Attributes/RequireStateAttribute.cs
@@ -6,7 +6,12 @@ namespace Alibi.Plugins.API.Attributes
     public class RequireStateAttribute : Attribute
     {
         public ClientState State { get; }
+        public bool Kick { get; }
 
-        public RequireStateAttribute(ClientState requiredState) => State = requiredState;
+        public RequireStateAttribute(ClientState requiredState, bool kickIfFalse = true)
+        {
+            State = requiredState;
+            Kick = kickIfFalse;
+        }
     }
 }
diff --git a/Alibi/Protocol/MessageHandler.cs b/Alibi/Protocol/MessageHandler.cs
index 331ed74..75d5601 100644
--- a/Alibi/Protocol/MessageHandler.cs
+++ b/Alibi/Protocol/MessageHandler.cs
@@ -24,11 +24,13 @@ public static void HandleMessage(IClient client, IAOPacket packet)
                     var stateAttr = Handlers[packet.Type].Method.GetCustomAttribute<RequireStateAttribute>();
 
                     if (stateAttr != null)
-                        if (client.CurrentState != stateAttr.State)
+                        if (client.CurrentState != stateAttr.State && stateAttr.Kick)
                         {
                             client.Kick("Protocol violation.");
                             return;
                         }
+                        else if(client.CurrentState != stateAttr.State)
+                            return;
 
                     Handlers[packet.Type].Method.Invoke(Handlers[packet.Type].Target, new object[] {client, packet});
                 }
diff --git a/Alibi/Protocol/Messages.cs b/Alibi/Protocol/Messages.cs
index 2d8e61d..c09458e 100644
--- a/Alibi/Protocol/Messages.cs
+++ b/Alibi/Protocol/Messages.cs
@@ -125,7 +125,7 @@ internal static void RequestCharacters(IClient client, IAOPacket packet)
         }
 
         [MessageHandler("RE")]
-        [RequireState(ClientState.Identified)]
+        [RequireState(ClientState.InArea, false)]
         internal static void RequestEvidence(IClient client, IAOPacket packet)
         {
             string[] evidenceList = new string[client.Area!.EvidenceList.Count];