Don't repeat if initial_session_setup fails
Do initial_session_setup eagerly if -c is passed [Fixes #860]