diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index f0e2736..8346c04 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -20,6 +20,7 @@
 import com.android.contacts.test.InjectedServices;
 
 import android.app.Application;
+import android.app.LoaderManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -92,6 +93,7 @@
         Context context = getApplicationContext();
         PreferenceManager.getDefaultSharedPreferences(context);
         AccountTypeManager.getInstance(context);
+        LoaderManager.enableDebugLogging(true);
 
         StrictMode.setThreadPolicy(
                 new StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build());
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index e3f5e1c..6bdfd97 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -401,9 +401,6 @@
     @Override
     public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
         if (!mEnabled) {
-            if (data != null) {
-                data.close();
-            }
             return;
         }
 
