Fix some minor bugs with the session
Put code outside of throw except statements