diff --git a/Borepin/Borepin/Page/MachineListPage.xaml b/Borepin/Borepin/Page/MachineListPage.xaml
index bd0e5a4..1bd975d 100644
--- a/Borepin/Borepin/Page/MachineListPage.xaml
+++ b/Borepin/Borepin/Page/MachineListPage.xaml
@@ -18,7 +18,7 @@
                 <ActivityIndicator IsRunning="{Binding IsBusy}"></ActivityIndicator>
             </StackLayout>
             <StackLayout IsVisible="{Binding IsBusy, Converter={StaticResource InvertBoolConverter}}">
-                <ListView ItemsSource="{Binding MachineListItemViewModel_List}">
+                <ListView ItemsSource="{Binding MachineListItemViewModel_List}" IsVisible="{Binding IsConnected}">
                     <ListView.ItemTemplate>
                         <DataTemplate>
                             <ViewCell>
@@ -27,6 +27,7 @@
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
+                <Label Text="Please connect to Server" IsVisible="{Binding IsConnected, Converter={StaticResource InvertBoolConverter}}"></Label>
             </StackLayout>
         </StackLayout>
     </ContentPage.Content>
diff --git a/Borepin/Borepin/PageModel/AddServerProcess/LoginPasswordPageModel.cs b/Borepin/Borepin/PageModel/AddServerProcess/LoginPasswordPageModel.cs
index 1661d54..fa1c092 100644
--- a/Borepin/Borepin/PageModel/AddServerProcess/LoginPasswordPageModel.cs
+++ b/Borepin/Borepin/PageModel/AddServerProcess/LoginPasswordPageModel.cs
@@ -4,6 +4,7 @@ using Borepin.Service.Connections;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Navigation;
+using System;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
@@ -28,7 +29,7 @@ namespace Borepin.PageModel.AddServerProcess
 
         private void LoadData()
         {
-            
+
         }
 
         private string _Username;
@@ -60,7 +61,15 @@ namespace Borepin.PageModel.AddServerProcess
 
             await _BFFHService.Authenticate(connection_update, Password).ConfigureAwait(false);
 
-            await _ConnectionService.AddConnection(_BFFHService.ActiveConnection);
+            try
+            {
+                await _ConnectionService.AddConnection(_BFFHService.ActiveConnection);
+            }
+            catch (ArgumentException)
+            {
+
+            }
+
             await _ConnectionService.LogConnect(_BFFHService.ActiveConnection);
 
             var result = await _NavigationService.NavigateAsync("/MainPage/NavigationPage/MachineListPage");
@@ -70,4 +79,5 @@ namespace Borepin.PageModel.AddServerProcess
                 System.Diagnostics.Debugger.Break();
             }
         }
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/Borepin/Borepin/PageModel/MachinePageModel.cs b/Borepin/Borepin/PageModel/MachinePageModel.cs
index d67b5d2..c624f01 100644
--- a/Borepin/Borepin/PageModel/MachinePageModel.cs
+++ b/Borepin/Borepin/PageModel/MachinePageModel.cs
@@ -13,7 +13,7 @@ namespace Borepin.PageModel
     public class MachinePageModel : PageModelBase
     {
         #region Private Properties
-        private IBFFHService _BFFHService;
+        private readonly IBFFHService _BFFHService;
         private string _Name;
         private Machine _Machine;
         #endregion