diff --git a/Engine/source/T3D/assets/ImageAsset.h b/Engine/source/T3D/assets/ImageAsset.h
index 97623f5a4..53f6189cd 100644
--- a/Engine/source/T3D/assets/ImageAsset.h
+++ b/Engine/source/T3D/assets/ImageAsset.h
@@ -243,7 +243,7 @@ public:
          return;                                                                                                                                                              \
       if(get##name##File() == _in)                                                                                                                                            \
          return;                                                                                                                                                              \
-      if(_in == NULL || _in == StringTable->EmptyString() || _in == "")                                                                                                       \
+      if(_in == NULL || !String::compare(_in,StringTable->EmptyString()))                                                                                                     \
       {                                                                                                                                                                       \
          m##name##Asset = NULL;                                                                                                                                               \
          m##name##File = "";                                                                                                                                                  \
@@ -300,7 +300,7 @@ public:
          return;                                                                                                                                                              \
       if(get##name##File() == _in)                                                                                                                                            \
          return;                                                                                                                                                              \
-      if(_in == NULL || _in == StringTable->EmptyString() || _in == "")                                                                                                       \
+      if(_in == NULL || !String::compare(_in,StringTable->EmptyString()))                                                                                                       \
       {                                                                                                                                                                       \
          m##name##Asset = NULL;                                                                                                                                               \
          m##name##File = "";                                                                                                                                                  \
@@ -364,7 +364,7 @@ public:
          return;                                                                                                                                                              \
       if(get##name##File(index) == _in)                                                                                                                                       \
          return;                                                                                                                                                              \
-      if(_in == NULL || _in == StringTable->EmptyString() || _in == "")                                                                                                       \
+      if(_in == NULL || !String::compare(_in,StringTable->EmptyString()))                                                                                                       \
       {                                                                                                                                                                       \
          m##name##Asset[index] = NULL;                                                                                                                                        \
          m##name##File[index] = "";                                                                                                                                           \
@@ -422,7 +422,7 @@ public:
          return;                                                                                                                                                              \
       if(get##name##File(index) == _in)                                                                                                                                       \
          return;                                                                                                                                                              \
-      if(_in == NULL || _in == StringTable->EmptyString() || _in == "")                                                                                                       \
+      if(_in == NULL || !String::compare(_in,StringTable->EmptyString()))                                                                                                       \
       {                                                                                                                                                                       \
          m##name##Asset[index] = NULL;                                                                                                                                        \
          m##name##File[index] = "";                                                                                                                                           \
diff --git a/Engine/source/T3D/assets/LevelAsset.h b/Engine/source/T3D/assets/LevelAsset.h
index 39339a41e..a085c46ee 100644
--- a/Engine/source/T3D/assets/LevelAsset.h
+++ b/Engine/source/T3D/assets/LevelAsset.h
@@ -197,7 +197,7 @@ public: \
          {\
             m##name##Asset->getChangedSignal().remove(this, &className::changeFunc);\
          }\
-         if (_in == NULL || _in == StringTable->EmptyString())\
+         if (_in == NULL || !String::compare(_in,StringTable->EmptyString()))\
          {\
             m##name##AssetId = StringTable->EmptyString();\
             m##name##Asset = NULL;\
diff --git a/Engine/source/T3D/assets/ShapeAsset.h b/Engine/source/T3D/assets/ShapeAsset.h
index 2328280da..09eb340e3 100644
--- a/Engine/source/T3D/assets/ShapeAsset.h
+++ b/Engine/source/T3D/assets/ShapeAsset.h
@@ -254,7 +254,7 @@ public:
          return;                                                                                                                                                              \
       if(get##name##File() == _in)                                                                                                                                            \
          return;                                                                                                                                                              \
-      if(_in == NULL || _in == StringTable->EmptyString() || _in == "")                                                                                                       \
+      if(_in == NULL || !String::compare(_in,StringTable->EmptyString()))                                                                                                       \
       {                                                                                                                                                                       \
          m##name##Asset = NULL;                                                                                                                                               \
          m##name##File = "";                                                                                                                                                  \
@@ -310,7 +310,7 @@ public:
          return;                                                                                                                                                              \
       if(get##name##File() == _in)                                                                                                                                            \
          return;                                                                                                                                                              \
-      if(_in == NULL || _in == StringTable->EmptyString() || _in == "")                                                                                                       \
+      if(_in == NULL || !String::compare(_in,StringTable->EmptyString()))                                                                                                       \
       {                                                                                                                                                                       \
          m##name##Asset = NULL;                                                                                                                                               \
          m##name##File = "";                                                                                                                                                  \
@@ -373,7 +373,7 @@ public:
          return;                                                                                                                                                              \
       if(get##name##File(index) == _in)                                                                                                                                       \
          return;                                                                                                                                                              \
-      if(_in == NULL || _in == StringTable->EmptyString() || _in == "")                                                                                                       \
+      if(_in == NULL || !String::compare(_in,StringTable->EmptyString()))                                                                                                       \
       {                                                                                                                                                                       \
          m##name##Asset[index] = NULL;                                                                                                                                        \
          m##name##File[index] = "";                                                                                                                                           \
@@ -429,7 +429,7 @@ public:
          return;                                                                                                                                                              \
       if(get##name##File(index) == _in)                                                                                                                                       \
          return;                                                                                                                                                              \
-      if (_in == NULL || _in == StringTable->EmptyString())                                                                                                                   \
+      if (_in == NULL || !String::compare(_in,StringTable->EmptyString()))                                                                                                                   \
       {                                                                                                                                                                       \
          m##name##Asset[index] = NULL;                                                                                                                                        \
          m##name##File[index] = "";                                                                                                                                           \
diff --git a/Engine/source/T3D/assets/SoundAsset.h b/Engine/source/T3D/assets/SoundAsset.h
index 8692e96f4..2e767de88 100644
--- a/Engine/source/T3D/assets/SoundAsset.h
+++ b/Engine/source/T3D/assets/SoundAsset.h
@@ -205,7 +205,7 @@ public: \
    {\
       if(m##name##AssetId != _in || m##name##Name != _in)\
       {\
-         if (_in == NULL || _in == StringTable->EmptyString())\
+         if (_in == NULL || !String::compare(_in,StringTable->EmptyString()))\
          {\
             m##name##Name = StringTable->EmptyString();\
             m##name##AssetId = StringTable->EmptyString();\
@@ -394,7 +394,7 @@ public: \
       {\
          if(index >= sm##name##Count || index < 0) \
                return false;\
-         if (_in == NULL || _in == StringTable->EmptyString())\
+         if (_in == NULL || !String::compare(_in,StringTable->EmptyString()))\
          {\
             m##name##Name[index] = StringTable->EmptyString();\
             m##name##AssetId[index] = StringTable->EmptyString();\
diff --git a/Engine/source/T3D/assets/SubSceneAsset.h b/Engine/source/T3D/assets/SubSceneAsset.h
index 444c4c23a..4134d0959 100644
--- a/Engine/source/T3D/assets/SubSceneAsset.h
+++ b/Engine/source/T3D/assets/SubSceneAsset.h
@@ -79,7 +79,7 @@ public: \
          {\
             m##name##Asset->getChangedSignal().remove(this, &className::changeFunc);\
          }\
-         if (_in == NULL || _in == StringTable->EmptyString())\
+         if (_in == NULL || !String::compare(_in,StringTable->EmptyString()))\
          {\
             m##name##AssetId = StringTable->EmptyString();\
             m##name##Asset = NULL;\