ExtendeContext "Null problem" fixed, #260