[NUI] Fix svace issues.

diff --git a/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs b/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
index d012093..94b58ad 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
+++ b/src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
@@ -155,13 +155,19 @@ namespace Tizen.NUI.Components
         private void OnAddedToWindow(object sender, EventArgs e)
         {
             parentWindow = Window.Get(this);
-            parentWindow.KeyEvent += OnWindowKeyEvent;
+            if (null != parentWindow)
+            {
+                parentWindow.KeyEvent += OnWindowKeyEvent;
+            }
         }
 
         private void OnRemovedFromWindow(object sender, EventArgs e)
         {
-            parentWindow.KeyEvent -= OnWindowKeyEvent;
-            parentWindow = null;
+            if (null != parentWindow)
+            {
+                parentWindow.KeyEvent -= OnWindowKeyEvent;
+                parentWindow = null;
+            }
         }
 
         private void Initialize()

diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs
index 67b126c..2c4d0a4 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs
+++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Layouter/GridLayouter.cs
@@ -1445,9 +1445,10 @@ namespace Tizen.NUI.Components
                         ScrollContentSize - Padding.Bottom - footerSize + footerMargin.Top;
                 return (xPos, yPos);
             }
-            if (isGrouped)
+
+            GroupInfo myGroup = GetGroupInfo(index);
+            if (isGrouped && null != myGroup)
             {
-                GroupInfo myGroup = GetGroupInfo(index);
                 if (colView.InternalItemSource.IsGroupHeader(index))
                 {
                     spaceStartX+= groupHeaderMargin.Start;