am 7f8ce7c9: Merge "Revert "Revert "NPE in TwoPaneController""" into jb-ub-mail-ur10
* commit '7f8ce7c946b28c2d4ef238fa43d0cf101b53cb21':
Revert "Revert "NPE in TwoPaneController""
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 0269b56..8588163 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -425,7 +425,7 @@
// folder list has had a chance to initialize.
final FolderListFragment folderList = getFolderListFragment();
if (mode == ViewMode.CONVERSATION_LIST && folderList != null
- && mFolder.parent != Uri.EMPTY) {
+ && mFolder != null && mFolder.parent != Uri.EMPTY) {
// If the user navigated via the left folders list into a child folder,
// back should take the user up to the parent folder's conversation list.
navigateUpFolderHierarchy();