From bad1ba044c60afcf20643883878f2103d9db9744 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 25 Dec 2014 02:30:46 +0300
Subject: Fixes AFTER submission

---
 Juick/ViewModels/LoginViewModel.cs | 2 +-
 Juick/ViewModels/PageViewModel.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Juick/ViewModels')

diff --git a/Juick/ViewModels/LoginViewModel.cs b/Juick/ViewModels/LoginViewModel.cs
index 9589f08..f6f50ec 100644
--- a/Juick/ViewModels/LoginViewModel.cs
+++ b/Juick/ViewModels/LoginViewModel.cs
@@ -60,7 +60,7 @@ namespace Juick.ViewModels
                                                                                      App.AppContext.Account.Password = Password;
                                                                                      App.AppContext.Account.IsAuthenticated = true;
                                                                                      App.AppContext.EnableNotifications();
-                                                                                     ((App)Application.Current).NavigateTo(NextUri, true);
+                                                                                     ((App)Application.Current).NavigateTo(NextUri);
                                                                                  }
                                                                                  else if (response.StatusCode ==
                                                                                           HttpStatusCode.Forbidden)
diff --git a/Juick/ViewModels/PageViewModel.cs b/Juick/ViewModels/PageViewModel.cs
index c13e6f1..152e9d9 100644
--- a/Juick/ViewModels/PageViewModel.cs
+++ b/Juick/ViewModels/PageViewModel.cs
@@ -73,7 +73,7 @@ namespace Juick.ViewModels
             _context.Client.ExecuteAsync<List<Message>>(request, response =>
             {
                 _context.IsDataLoading = false;
-                if (response.ErrorException != null)
+                if (response == null || response.ErrorException != null)
                 {
                     return;
                 }
-- 
cgit v1.2.3