diff --git a/JellyfinPlayer/ConnectToServerView.swift b/JellyfinPlayer/ConnectToServerView.swift
index 1fcb6cc0..d07655bb 100644
--- a/JellyfinPlayer/ConnectToServerView.swift
+++ b/JellyfinPlayer/ConnectToServerView.swift
@@ -176,7 +176,7 @@ struct ConnectToServerView: View {
                                 let server = response
                                 serverName = server.serverName!
                                 server_id = server.id!
-                                if server.startupWizardCompleted! {
+                                if server.startupWizardCompleted ?? true {
                                     isConnected = true
 
                                     UserAPI.getPublicUsers()
diff --git a/JellyfinPlayer/LibraryView.swift b/JellyfinPlayer/LibraryView.swift
index d90775b3..5161caa0 100644
--- a/JellyfinPlayer/LibraryView.swift
+++ b/JellyfinPlayer/LibraryView.swift
@@ -49,13 +49,13 @@ struct LibraryView: View {
     init(withGenre: NameGuidPair) {
         self.usingParentID = ""
         self.title = withGenre.name ?? ""
-        self.genre = withGenre.id ?? ""
+        self.genre = withGenre.id!
     }
 
     init(withStudio: NameGuidPair) {
         self.usingParentID = ""
         self.title = withStudio.name ?? ""
-        self.studio = withStudio.id ?? ""
+        self.studio = withStudio.id!
     }
 
     func onAppear() {