diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index 108ab71923af2..eff77b56068e8 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -788,7 +788,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
         // We'll have the FragmentManager check that for validity when we move
         // the fragments to a valid state.
         final FragmentManager mine = getFragmentManager();
-        final FragmentManager theirs = fragment.getFragmentManager();
+        final FragmentManager theirs = fragment != null ? fragment.getFragmentManager() : null;
         if (mine != null && theirs != null && mine != theirs) {
             throw new IllegalArgumentException("Fragment " + fragment
                     + " must share the same FragmentManager to be set as a target fragment");