diff --git a/Framework/Editor/V1/AacInternals.cs b/Framework/Editor/V1/AacInternals.cs
index f8ff642..ed47fde 100644
--- a/Framework/Editor/V1/AacInternals.cs
+++ b/Framework/Editor/V1/AacInternals.cs
@@ -16,7 +16,7 @@ namespace AnimatorAsCode.V1
             var animatorController = new AnimatorController();
             animatorController.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
             animatorController.hideFlags = HideFlags.None;
-            AssetDatabase.AddObjectToAsset(animatorController, component.AssetContainer);
+            if (component.AssetContainer != null) AssetDatabase.AddObjectToAsset(animatorController, component.AssetContainer);
             return animatorController;
         }
 
@@ -29,7 +29,7 @@ namespace AnimatorAsCode.V1
         {
             clip.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
             clip.hideFlags = HideFlags.None;
-            AssetDatabase.AddObjectToAsset(clip, component.AssetContainer);
+            if (component.AssetContainer != null) AssetDatabase.AddObjectToAsset(clip, component.AssetContainer);
             return clip;
         }
 
@@ -38,7 +38,7 @@ namespace AnimatorAsCode.V1
             var clip = new BlendTree();
             clip.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
             clip.hideFlags = HideFlags.None;
-            AssetDatabase.AddObjectToAsset(clip, component.AssetContainer);
+            if (component.AssetContainer != null) AssetDatabase.AddObjectToAsset(clip, component.AssetContainer);
             return clip;
         }
 
@@ -47,7 +47,7 @@ namespace AnimatorAsCode.V1
             var duplicated = (T)Object.Instantiate(assetToDuplicate);
             duplicated.name = "zAutogenerated__" + component.AssetKey + "__" + assetToDuplicate.name + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
             duplicated.hideFlags = HideFlags.None;
-            AssetDatabase.AddObjectToAsset(duplicated, component.AssetContainer);
+            if (component.AssetContainer != null) AssetDatabase.AddObjectToAsset(duplicated, component.AssetContainer);
             return duplicated;
         }