Fix issue with error when the context object is not set
Merge pull request #1 from briandela/master

Fix issue with error when the context object is not set