Merge "Do not crash if secontext is nullptr"