bug fixes - no null value in sessions