diff --git a/ZeroLevel/Services/FileSystem/FSUtils.cs b/ZeroLevel/Services/FileSystem/FSUtils.cs
index 41acf60..451c570 100644
--- a/ZeroLevel/Services/FileSystem/FSUtils.cs
+++ b/ZeroLevel/Services/FileSystem/FSUtils.cs
@@ -304,5 +304,10 @@ namespace ZeroLevel.Services.FileSystem
                 }
             }
         }
+
+        public static bool IsDirectoryEmpty(string path)
+        {
+            return !Directory.EnumerateFileSystemEntries(path).Any();
+        }
     }
 }
\ No newline at end of file
diff --git a/ZeroLevel/Services/Serialization/MessageSerializer.cs b/ZeroLevel/Services/Serialization/MessageSerializer.cs
index b28cd10..6945eef 100644
--- a/ZeroLevel/Services/Serialization/MessageSerializer.cs
+++ b/ZeroLevel/Services/Serialization/MessageSerializer.cs
@@ -77,6 +77,10 @@ namespace ZeroLevel.Services.Serialization
 
         public static byte[] SerializeCompatible(object obj)
         {
+            if (null == obj)
+            {
+                return null;
+            }
             var direct_seriazlizable = (obj as IBinarySerializable);
             if (direct_seriazlizable != null)
             {
@@ -95,6 +99,10 @@ namespace ZeroLevel.Services.Serialization
 
         public static byte[] SerializeCompatible<T>(T obj)
         {
+            if (null == obj)
+            {
+                return null;
+            }
             var direct_seriazlizable = (obj as IBinarySerializable);
             if (direct_seriazlizable != null)
             {