improvements
Context now throws an UnresolvableValueException instead of returning null to indicate an unresolvable value.