Additional fix for null UserContext