From 8fd0476353de7a2797a6a5c009ffcdb4fef91bd9 Mon Sep 17 00:00:00 2001
From: Sebastian Witalec <sebawita@users.noreply.github.com>
Date: Sun, 5 Jun 2016 22:57:19 +0100
Subject: [PATCH] Fixing currentEntry bug

The app crashes when it tries to access currentEntry property when _currentEntry is null.
---
 tns-core-modules/ui/frame/frame-common.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tns-core-modules/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts
index b911a8dd4..b24984897 100644
--- a/tns-core-modules/ui/frame/frame-common.ts
+++ b/tns-core-modules/ui/frame/frame-common.ts
@@ -368,7 +368,11 @@ export class Frame extends CustomLayoutView implements definition.Frame {
     }
 
     get currentEntry(): definition.NavigationEntry {
-        return this._currentEntry.entry;
+        if (this._currentEntry) {
+            return this._currentEntry.entry;
+        }
+        
+        return null;
     }
 
     public _pushInFrameStack() {