Catch keyerrors.
Add special case for set_fact.
Merge pull request #672 from edx/feanil/abbey_keyerror

Feanil/abbey keyerror