Session nulls fixed