Critical fix, non-addopt session save crashing