From ddb28a9b90829db91ec7e1c930920851467e9f4d Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Mon, 13 Feb 2017 09:38:48 +0000
Subject: [PATCH] null enhance

---
 Wox.Infrastructure/Storage/BinaryStorage.cs | 2 +-
 Wox.Infrastructure/Storage/JsonStorage.cs   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Wox.Infrastructure/Storage/BinaryStorage.cs b/Wox.Infrastructure/Storage/BinaryStorage.cs
index b5128e4721..1c49714bd2 100644
--- a/Wox.Infrastructure/Storage/BinaryStorage.cs
+++ b/Wox.Infrastructure/Storage/BinaryStorage.cs
@@ -64,7 +64,7 @@ namespace Wox.Infrastructure.Storage
 
             try
             {
-                var t = (T)binaryFormatter.Deserialize(stream);
+                var t = ((T)binaryFormatter.Deserialize(stream)).NonNull();
                 return t;
             }
             catch (System.Exception e)
diff --git a/Wox.Infrastructure/Storage/JsonStorage.cs b/Wox.Infrastructure/Storage/JsonStorage.cs
index 191013fb2f..a82b38fadf 100644
--- a/Wox.Infrastructure/Storage/JsonStorage.cs
+++ b/Wox.Infrastructure/Storage/JsonStorage.cs
@@ -49,20 +49,25 @@ namespace Wox.Infrastructure.Storage
             {
                 LoadDefault();
             }
-            return _data;
+            return _data.NonNull();
         }
 
         private void Deserialize(string searlized)
         {
             try
             {
-                _data = JsonConvert.DeserializeObject<T>(searlized, _serializerSettings).NonNull();
+                _data = JsonConvert.DeserializeObject<T>(searlized, _serializerSettings);
             }
             catch (JsonSerializationException e)
             {
                 LoadDefault();
                 Log.Exception($"|JsonStrorage.Deserialize|Deserialize error for json <{FilePath}>", e);
             }
+
+            if (_data == null)
+            {
+                LoadDefault();
+            }
         }
 
         private void LoadDefault()