fixed context null pointer