diff --git a/src/com/android/contacts/calllog/CallLogFragment.java b/src/com/android/contacts/calllog/CallLogFragment.java
index 3850a0b..5872043 100644
--- a/src/com/android/contacts/calllog/CallLogFragment.java
+++ b/src/com/android/contacts/calllog/CallLogFragment.java
@@ -806,8 +806,8 @@
         @Override
         protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
             final CallLogFragment fragment = mFragment.get();
-            // TODO: Do we still need the isFinishing check if we use a fragmented-Tabs?
-            if (fragment != null && !fragment.getActivity().isFinishing()) {
+            if (fragment != null && fragment.getActivity() != null &&
+                    !fragment.getActivity().isFinishing()) {
                 final CallLogFragment.CallLogAdapter callsAdapter = fragment.mAdapter;
                 callsAdapter.setLoading(false);
                 callsAdapter.changeCursor(cursor);