diff --git a/addons/sourcemod/scripting/friendlyfire.sp b/addons/sourcemod/scripting/friendlyfire.sp
index 9b1ecfd..323d0c5 100644
--- a/addons/sourcemod/scripting/friendlyfire.sp
+++ b/addons/sourcemod/scripting/friendlyfire.sp
@@ -25,7 +25,7 @@
 #include <tf2_stocks>
 #include <tf2utils>
 
-#define PLUGIN_VERSION	"1.2.1"
+#define PLUGIN_VERSION	"1.2.2"
 
 #define TICK_NEVER_THINK	-1.0
 #define TF_CUSTOM_NONE		0
@@ -100,6 +100,8 @@ public void OnPluginStart()
 {
 	RegPluginLibrary("friendlyfire");
 	
+	Entity.Initialize();
+	
 	ConVars_Initialize();
 	SDKHooks_Initialize();
 	
diff --git a/addons/sourcemod/scripting/friendlyfire/entity.sp b/addons/sourcemod/scripting/friendlyfire/entity.sp
index 34b7d42..142762f 100644
--- a/addons/sourcemod/scripting/friendlyfire/entity.sp
+++ b/addons/sourcemod/scripting/friendlyfire/entity.sp
@@ -45,11 +45,6 @@ methodmap Entity
 			return view_as<Entity>(INVALID_ENT_REFERENCE);
 		}
 		
-		if (!g_entityProperties)
-		{
-			g_entityProperties = new ArrayList(sizeof(EntityProperties));
-		}
-		
 		int ref = IsValidEdict(entity) ? EntIndexToEntRef(entity) : entity;
 		
 		if (!Entity.IsReferenceTracked(ref))
@@ -213,4 +208,9 @@ methodmap Entity
 	{
 		return g_entityProperties.FindValue(ref, EntityProperties::ref) != -1;
 	}
+	
+	public static void Initialize()
+	{
+		g_entityProperties = new ArrayList(sizeof(EntityProperties));
+	}
 }