Removed some dependecies on session failure