X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FTizen.NUI%2Fsrc%2Fpublic%2FXamlBinding%2FContentPage.cs;h=1ddfc1ee99c29a6a712b404747b52cc661ff9a72;hb=1eb1210483e0cdc0d0f7b6c71e1770f2a68cdb53;hp=3c2647abbd3cf72bc50701af35df99e4b07699d2;hpb=58c04dae4827297300e42822daad1087f37c1ff2;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

diff --git a/src/Tizen.NUI/src/public/XamlBinding/ContentPage.cs b/src/Tizen.NUI/src/public/XamlBinding/ContentPage.cs
index 3c2647a..1ddfc1e 100755
--- a/src/Tizen.NUI/src/public/XamlBinding/ContentPage.cs
+++ b/src/Tizen.NUI/src/public/XamlBinding/ContentPage.cs
@@ -162,10 +162,12 @@ namespace Tizen.NUI
             //Release your own unmanaged resources here.
             //You should not access any managed member here except static instance.
             //because the execution order of Finalizes is non-deterministic.
-            Window.Instance.Remove(Root);
-            Root?.Dispose();
-            Root = null;
-
+            if(Root != null) 
+            {
+                Window.Instance.Remove(Root);
+                Root.Dispose();
+                Root = null;
+            }
             base.Dispose(type);
         }