diff --git a/components/config/SetServerScreen.bs b/components/config/SetServerScreen.bs
index 573cb27d..5540a24b 100644
--- a/components/config/SetServerScreen.bs
+++ b/components/config/SetServerScreen.bs
@@ -157,8 +157,7 @@ sub clearErrorMessage()
     m.top.errorMessage = ""
 end sub
 
-' JFScreen hook.
-' Used to show logo, update the focus, the state of the data, and tells the server about the device profile.
+' JFScreen hook called when the screen is displayed by the screen manager
 sub OnScreenShown()
     scene = m.top.getScene()
     overhang = scene.findNode("overhang")
diff --git a/components/home/Home.bs b/components/home/Home.bs
index 5a5b2890..d11ecbc3 100644
--- a/components/home/Home.bs
+++ b/components/home/Home.bs
@@ -30,8 +30,7 @@ sub loadLibraries()
     m.fadeInFocusBitmap.control = "start"
 end sub
 
-' JFScreen hook.
-' Used to show logo, update the focus, the state of the data, and tells the server about the device profile.
+' JFScreen hook called when the screen is displayed by the screen manager
 sub OnScreenShown()
     scene = m.top.getScene()
     overhang = scene.findNode("overhang")
@@ -61,8 +60,7 @@ sub OnScreenShown()
     end if
 end sub
 
-' JFScreen hook.
-' Remove the Jellyfin logo and left seperator from the overhang
+' JFScreen hook called when the screen is hidden by the screen manager
 sub OnScreenHidden()
     scene = m.top.getScene()
     overhang = scene.findNode("overhang")
diff --git a/components/home/HomeRows.bs b/components/home/HomeRows.bs
index 958ba22c..a4671ae5 100644
--- a/components/home/HomeRows.bs
+++ b/components/home/HomeRows.bs
@@ -94,7 +94,12 @@ sub processUserSections()
     ' Add home sections in order based on user settings
     loadedSections = 0
     for i = 0 to 6
-        sectionName = LCase(m.global.session.user.settings["homesection" + i.toStr()])
+        sectionName = m.global.session.user.settings["homesection" + i.toStr()]
+        if isValid(sectionName)
+            sectionName = LCase(sectionName)
+        else
+            exit for
+        end if
         sectionLoaded = false
         if sectionName <> "none"
             sectionLoaded = addHomeSection(sectionName)
diff --git a/components/login/UserSelect.bs b/components/login/UserSelect.bs
index cfd120c4..818157b4 100644
--- a/components/login/UserSelect.bs
+++ b/components/login/UserSelect.bs
@@ -24,8 +24,7 @@ sub redraw()
     m.top.findNode("UserRow").translation = [leftBorder, topBorder]
 end sub
 
-' JFScreen hook.
-' Used to show logo, update the focus, the state of the data, and tells the server about the device profile.
+' JFScreen hook called when the screen is displayed by the screen manager
 sub OnScreenShown()
     scene = m.top.getScene()
     overhang = scene.findNode("overhang")