Added null fix for varclosure