diff --git a/P3D/Entites/Enviroment/WarpBlock.vb b/P3D/Entites/Enviroment/WarpBlock.vb
index 939582d4f..783637500 100644
--- a/P3D/Entites/Enviroment/WarpBlock.vb
+++ b/P3D/Entites/Enviroment/WarpBlock.vb
@@ -43,8 +43,8 @@
                     Screen.Level.WarpData.IsWarpBlock = True
                     Logger.Debug("Lock Camera")
                     CType(Screen.Camera, OverworldCamera).YawLocked = True
-                    Else
-                        Screen.Level = New Level()
+                Else
+                    Screen.Level = New Level()
                     Screen.Level.Load(Me.AdditionalValue.GetSplit(0))
                     Screen.Level.World.Initialize(Screen.Level.EnvironmentType, Screen.Level.WeatherType)
 
diff --git a/P3D/Screens/MainMenu/AddServerScreen.vb b/P3D/Screens/MainMenu/AddServerScreen.vb
index 32a5b024f..8591aa24d 100644
--- a/P3D/Screens/MainMenu/AddServerScreen.vb
+++ b/P3D/Screens/MainMenu/AddServerScreen.vb
@@ -21,7 +21,7 @@
             Me.ServerNames.Add(s.IdentifierName.ToLower())
         Next
 
-        Me.CanBePaused = True
+        Me.CanBePaused = False
         Me.CanChat = False
         Me.CanMuteMusic = False
         Me.MouseVisible = True
diff --git a/P3D/Screens/MainMenu/PauseScreen.vb b/P3D/Screens/MainMenu/PauseScreen.vb
index a62380869..7982121c0 100644
--- a/P3D/Screens/MainMenu/PauseScreen.vb
+++ b/P3D/Screens/MainMenu/PauseScreen.vb
@@ -25,17 +25,21 @@
         If Core.Player.IsGameJoltSave = True Then
             Me.canCreateAutosave = False
         Else
-            If Me.PreScreen IsNot Nothing AndAlso Camera.Name IsNot Nothing Then
-                If Camera.Name <> "Overworld" Then
-                    Me.canCreateAutosave = False
-                Else
-                    Dim s As Screen = Me.PreScreen
-                    While s.Identification <> Identifications.OverworldScreen And Not s.PreScreen Is Nothing
-                        s = s.PreScreen
-                    End While
-                    If s.Identification = Identifications.OverworldScreen Then
-                        If CType(s, OverworldScreen).ActionScript.IsReady = False Then
-                            Me.canCreateAutosave = False
+            If Me.PreScreen IsNot Nothing Then
+                If Camera Is Nothing Then
+                    Camera = New OverworldCamera()
+                ElseIf Camera.Name IsNot Nothing Then
+                    If Camera.Name <> "Overworld" Then
+                        Me.canCreateAutosave = False
+                    Else
+                        Dim s As Screen = Me.PreScreen
+                        While s.Identification <> Identifications.OverworldScreen And Not s.PreScreen Is Nothing
+                            s = s.PreScreen
+                        End While
+                        If s.Identification = Identifications.OverworldScreen Then
+                            If CType(s, OverworldScreen).ActionScript.IsReady = False Then
+                                Me.canCreateAutosave = False
+                            End If
                         End If
                     End If
                 End If