diff --git a/composer/schema/grid/field.py b/composer/schema/grid/field.py
index 95195f0..9c93d7a 100644
--- a/composer/schema/grid/field.py
+++ b/composer/schema/grid/field.py
@@ -128,7 +128,7 @@ class GridFieldInstance(ListFieldInstance):
 class RecordsFieldInstance(GridFieldInstance):
 
     def getRenderer(self, name):
-        return grid_macros.macros[name]
+        return grid_macros.macros.get(name)
 
     def marshall(self, value):
         result = []
diff --git a/stateful/base.py b/stateful/base.py
index 3d64858..9f41686 100644
--- a/stateful/base.py
+++ b/stateful/base.py
@@ -51,8 +51,10 @@ class Stateful(object):
         return self.state
 
     def getStateObject(self):
-        state = self.getState()
-        return self.getStatesDefinition().states[state]
+        states = self.getStatesDefinition().states
+        if self.state not in states:
+            self.state = self.getStatesDefinition().initialState
+        return states[self.state]
 
     def doTransition(self, transition, historyInfo=None):
         sd = self.getStatesDefinition()