Check for null context along with null context id.
Merge pull request #1320 from reciprocity/feature/audit-context-null-check

Check for null context along with null context id.