null check required, backed by unit test
Merge pull request #268 from skelter/ContextNullCheck

Context null check