Can add a NullVariableResolver to use as the default to simplify this code