From 25c8bfbb33a2a19271068d19e746e38e35b0983b Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@gmail.com>
Date: Thu, 25 Feb 2016 14:19:01 +0200
Subject: [PATCH] Action bar safety checks

---
 ui/action-bar/action-bar.android.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/action-bar/action-bar.android.ts b/ui/action-bar/action-bar.android.ts
index 1075119fb..c1ebd37a3 100644
--- a/ui/action-bar/action-bar.android.ts
+++ b/ui/action-bar/action-bar.android.ts
@@ -301,14 +301,14 @@ export class ActionBar extends common.ActionBar {
 
     public _onTitlePropertyChanged() {
         var topFrame = frame.topmost();
-        if (topFrame && topFrame.currentPage === this.page) {
+        if (this._toolbar && topFrame && topFrame.currentPage === this.page) {
             this._updateTitleAndTitleView();
         }
     }
 
     public _onIconPropertyChanged() {
         var topFrame = frame.topmost();
-        if (topFrame && topFrame.currentPage === this.page) {
+        if (this._toolbar && topFrame && topFrame.currentPage === this.page) {
             this._updateIcon();
         }
     }