Cookie rename NPE fix