From f934f8136b09e5d619243a898710bf794fc0372a Mon Sep 17 00:00:00 2001
From: Nic Capdevila <nic@rockbot.com>
Date: Wed, 15 Nov 2017 22:22:53 -0800
Subject: [PATCH] - make sure we can find the fragment in the stack before we
 set it

---
 .../main/java/com/ncapdevi/fragnav/FragNavController.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.java b/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.java
index bfb905fa..8520c1d9 100644
--- a/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.java
+++ b/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.java
@@ -608,9 +608,13 @@ public Fragment getCurrentFrag() {
         //if not, try to pull it from the stack
         Stack<Fragment> fragmentStack = mFragmentStacks.get(mSelectedTabIndex);
         if (!fragmentStack.isEmpty()) {
-            mCurrentFrag = mFragmentManager.findFragmentByTag(mFragmentStacks.get(mSelectedTabIndex).peek().getTag());
+            Fragment fragmentByTag = mFragmentManager.findFragmentByTag(mFragmentStacks.get(mSelectedTabIndex).peek().getTag());
+            if (fragmentByTag != null) {
+                mCurrentFrag = fragmentByTag;
+            }
         }
 
+
         return mCurrentFrag;
     }