HotFix DPP context null pointer exception