fixed null merchello context
Merge pull request #988 from dfberry/1.5.1

fixed null merchello context