Only save session if needed @coenjacobs