Avoid npe for new sessions