@gmcferrin I only copied the server null check from here. I do not know for sure whether it is needed.