Added null check to get rid of 'NULL Session' spam