From 3537c431d558e63bcd54c97a0a459ac27b9a98c5 Mon Sep 17 00:00:00 2001
From: sunzhuokai <623326787@qq.com>
Date: Thu, 14 Dec 2017 15:01:46 +0800
Subject: [PATCH] fix issues#8

---
 .../Convert/ToValueType/Object.ToCharOrDefault.cs    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Z.Core/System.Object/Convert/ToValueType/Object.ToCharOrDefault.cs b/src/Z.Core/System.Object/Convert/ToValueType/Object.ToCharOrDefault.cs
index 9f5bf259..96ce1765 100644
--- a/src/Z.Core/System.Object/Convert/ToValueType/Object.ToCharOrDefault.cs
+++ b/src/Z.Core/System.Object/Convert/ToValueType/Object.ToCharOrDefault.cs
@@ -3,7 +3,7 @@
 // Forum: https://github.com/zzzprojects/Z.ExtensionMethods/issues
 // License: https://github.com/zzzprojects/Z.ExtensionMethods/blob/master/LICENSE
 // More projects: http://www.zzzprojects.com/
-// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
+// Copyright © ZZZ Projects Inc. 2014 - 2016. All rights reserved.
 using System;
 
 public static partial class Extensions
@@ -61,6 +61,10 @@ public static char ToCharOrDefault(this object @this, char defaultValue, bool us
         {
             return Convert.ToChar(@this);
         }
+        catch (ArgumentNullException)
+        {
+            return default(char); 
+        }
         catch (Exception)
         {
             return defaultValue;
@@ -103,9 +107,13 @@ public static char ToCharOrDefault(this object @this, Func<char> defaultValueFac
         {
             return Convert.ToChar(@this);
         }
+        catch (ArgumentNullException)
+        {
+            return default(char); 
+        }
         catch (Exception)
         {
             return defaultValueFactory();
         }
     }
-}
\ No newline at end of file
+}