diff --git a/changelog.txt b/changelog.txt
index ea4bef2..00fa773 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+---------------------------------------------------------------------------------------------------
+Version: 3.3.3
+  Bugfixes:
+    - Added check for invalid entity upgrade
+
 ---------------------------------------------------------------------------------------------------
 Version: 3.3.2
   Bugfixes:
diff --git a/libs/BaseUtils.lua b/libs/BaseUtils.lua
index 1225f14..96c1f37 100644
--- a/libs/BaseUtils.lua
+++ b/libs/BaseUtils.lua
@@ -456,7 +456,7 @@ function BaseUtils.queueUpgrade(entity, base, disPos, evolve, timeDelay)
                                    evolve)
 
     local entityName = entity.name
-    if name == entityName then
+    if not name or (name == entityName) then
         return
     end