diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index 91d95788..b6c4183d 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -8,7 +8,6 @@ function LoginFlow(startOver = false as boolean)
         startOver = not session.server.UpdateURL(serverUrl)
         if startOver
             print "Could not connect to previously saved server."
-            session.server.Delete()
         end if
     else
         startOver = true
diff --git a/source/utils/session.bs b/source/utils/session.bs
index 45a10fca..4f2e2552 100644
--- a/source/utils/session.bs
+++ b/source/utils/session.bs
@@ -64,7 +64,13 @@ namespace session
             ' validate parameters
             if value = "" then return false
             session.server.Update("url", value)
-            return session.server.Populate()
+
+            success = session.server.Populate()
+            if not success
+                session.server.Delete()
+            end if
+
+            return success
         end function
 
         ' Use the saved server url to populate the global server session array (m.global.session.server)