diff --git a/Borepin/Borepin/Model/UserVisualize.cs b/Borepin/Borepin/Model/UserVisualize.cs
index 8f3d3b5..250c62a 100644
--- a/Borepin/Borepin/Model/UserVisualize.cs
+++ b/Borepin/Borepin/Model/UserVisualize.cs
@@ -20,6 +20,11 @@ namespace Borepin.Model
#region LoadData
public Task LoadData()
{
+ if(_User == null)
+ {
+ return Task.CompletedTask;
+ }
+
//ID = _User.Id;
Username = _User.Username;
//Space = new SpaceVisualize(_User.Space);
diff --git a/Borepin/Borepin/Page/AddServerProcess/SelectServerPage.xaml b/Borepin/Borepin/Page/AddServerProcess/SelectServerPage.xaml
index b91dfbc..b8b2a51 100644
--- a/Borepin/Borepin/Page/AddServerProcess/SelectServerPage.xaml
+++ b/Borepin/Borepin/Page/AddServerProcess/SelectServerPage.xaml
@@ -22,9 +22,11 @@
diff --git a/Borepin/Borepin/Page/CreateCardPage.xaml b/Borepin/Borepin/Page/CreateCardPage.xaml
index 5bf96a5..072c61e 100644
--- a/Borepin/Borepin/Page/CreateCardPage.xaml
+++ b/Borepin/Borepin/Page/CreateCardPage.xaml
@@ -37,7 +37,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
diff --git a/Borepin/Borepin/Page/MachineListPage.xaml b/Borepin/Borepin/Page/MachineListPage.xaml
index 2201d09..1f7a802 100644
--- a/Borepin/Borepin/Page/MachineListPage.xaml
+++ b/Borepin/Borepin/Page/MachineListPage.xaml
@@ -29,12 +29,14 @@
+
+
+
+
+
+
+
+
diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml
index e82055f..47857ae 100644
--- a/Borepin/Borepin/Page/MachinePage.xaml
+++ b/Borepin/Borepin/Page/MachinePage.xaml
@@ -43,29 +43,18 @@
-
-
-
+
+
+
+
+
-
-
+
+
+
+
-
-
+
diff --git a/Borepin/Borepin/Page/UserPage.xaml b/Borepin/Borepin/Page/UserPage.xaml
index e314dc8..d991521 100644
--- a/Borepin/Borepin/Page/UserPage.xaml
+++ b/Borepin/Borepin/Page/UserPage.xaml
@@ -41,9 +41,19 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Borepin/Borepin/PageModel/UserPageModel.cs b/Borepin/Borepin/PageModel/UserPageModel.cs
index 5c1bea9..0a799e7 100644
--- a/Borepin/Borepin/PageModel/UserPageModel.cs
+++ b/Borepin/Borepin/PageModel/UserPageModel.cs
@@ -71,6 +71,11 @@ namespace Borepin.PageModel
}
_User = (await _API.Session.UserSystem.Search.GetUserByName(_ID).ConfigureAwait(false)).Just;
+ if(_User == null )
+ {
+ return;
+ }
+
UserItem = new UserVisualize(_User);
await UserItem.LoadData().ConfigureAwait(false);