fixed null merchello context