diff --git a/Editor/AV3ObfuscatorEditor.cs b/Editor/AV3ObfuscatorEditor.cs
index 8760276..c323d2b 100644
--- a/Editor/AV3ObfuscatorEditor.cs
+++ b/Editor/AV3ObfuscatorEditor.cs
@@ -68,6 +68,10 @@ public override void OnInspectorGUI() {
                 Animator[] animators = descriptor.GetComponentsInChildren<Animator>(true);
 
                 foreach (var item in animators) {
+
+                    if (item.runtimeAnimatorController == null)
+                        continue;
+
                     AnimatorController controller = (AnimatorController)item.runtimeAnimatorController;
 
                     foreach (var parameter in controller.parameters) {
diff --git a/Editor/Obfuscator.cs b/Editor/Obfuscator.cs
index 463e859..705102d 100644
--- a/Editor/Obfuscator.cs
+++ b/Editor/Obfuscator.cs
@@ -557,7 +557,7 @@ void ObfuscateControllers(VRCAvatarDescriptor descriptor, Animator animator) {
 
             foreach (var item in animators) {
 
-                if (item == animator)
+                if (item == animator || item.runtimeAnimatorController == null)
                     continue;
 
                 AnimatorController obfuscatedController = ObfuscateController((AnimatorController)item.runtimeAnimatorController);
diff --git a/package.json b/package.json
index 69dbfeb..bdf7a67 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.esska.av3obfuscator",
   "displayName": "Esska AV3 Obfuscator",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "unity": "2019.4",
   "description": "Esska AV3Obfuscator allows you to obfuscate your VRChat avatar.",
   "author": {