diff --git a/Changelog.txt b/Changelog.txt
index c45766a61..3953b678a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,6 @@
+Version 2.1.73
+    Fixed a NPE that could occur if an entire skill was disabled in coreskills.yml
+
 Version 2.1.72
     Fixed a NPE if a server shutdown with no player data needing to be saved (the error is harmless but spammy)
     Fixed a NPE that could occur if Roll was disabled in coreskills.yml
diff --git a/pom.xml b/pom.xml
index 0c782ce92..079409501 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.72</version>
+    <version>2.1.73</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 1c9e415d2..1778f5737 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -568,6 +568,8 @@ public class mcMMO extends JavaPlugin {
          * Acrobatics skills
          */
 
+        InteractionManager.initMaps(); //Init maps
+
         if(CoreSkillsConfig.getInstance().isPrimarySkillEnabled(PrimarySkillType.ACROBATICS))
         {
             System.out.println("[mcMMO]" + " enabling Acrobatics Skills");
@@ -575,7 +577,6 @@ public class mcMMO extends JavaPlugin {
             //TODO: Should do this differently
             Roll roll = new Roll();
             CoreSkillsConfig.getInstance().isSkillEnabled(roll);
-            InteractionManager.initMaps();
             InteractionManager.registerSubSkill(new Roll());
         }
     }