diff --git a/UIX/Microsoft/Iris/UI/Class.cs b/UIX/Microsoft/Iris/UI/Class.cs
index 68efeb8..4cd02d3 100644
--- a/UIX/Microsoft/Iris/UI/Class.cs
+++ b/UIX/Microsoft/Iris/UI/Class.cs
@@ -107,7 +107,8 @@ namespace Microsoft.Iris.UI
 
         public virtual void WriteSymbol(SymbolReference symbolRef, object value) => SetProperty(symbolRef.Symbol, value);
 
-        public virtual object GetProperty(string name) => _storage[name];
+        // TODO: UNDO ME
+        public virtual object GetProperty(string name) => _storage.ContainsKey(name) ? _storage[name] : null;
 
         public virtual void SetProperty(string name, object value)
         {