- make sure we can find the fragment in the stack before we set it

Author: ncapdevi

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;
     }