[NUI] Fix svace issues

diff --git a/src/Tizen.NUI.Wearable/src/public/NUIWatchApplication.cs b/src/Tizen.NUI.Wearable/src/public/NUIWatchApplication.cs
index ad696ef..d466716 100755 (executable)
--- a/src/Tizen.NUI.Wearable/src/public/NUIWatchApplication.cs
+++ b/src/Tizen.NUI.Wearable/src/public/NUIWatchApplication.cs
@@ -216,7 +216,7 @@ namespace Tizen.NUI
         protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
         {
             Log.Debug("NUI", "OnAppControlReceived() is called!");
-            if (e != null)
+            if (e != null && e.ReceivedAppControl != null)
             {
                 Log.Debug("NUI", "OnAppControlReceived() is called! ApplicationId=" + e.ReceivedAppControl.ApplicationId);
                 Log.Debug("NUI", "CallerApplicationId=" + e.ReceivedAppControl.CallerApplicationId + "   IsReplyRequest=" + e.ReceivedAppControl.IsReplyRequest);

diff --git a/src/Tizen.NUI/src/public/Application/NUIApplication.cs b/src/Tizen.NUI/src/public/Application/NUIApplication.cs
index 57af84a..4d43a91 100755 (executable)
--- a/src/Tizen.NUI/src/public/Application/NUIApplication.cs
+++ b/src/Tizen.NUI/src/public/Application/NUIApplication.cs
@@ -568,7 +568,7 @@ namespace Tizen.NUI
         {
             Tizen.Tracer.Begin("[NUI] OnPreCreate()");
 
-            if (borderEnabled)
+            if (borderEnabled && GetDefaultWindow() != null)
             {
                 GetDefaultWindow().EnableBorder(borderInterface, new Window.BorderCloseDelegate(Exit));
             }