diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 31cfd6c022b12b..cc2b72f1deee3c 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -2155,8 +2155,8 @@ void GetAllNodesRequestHelper::OnReceivedNodesForTypes(
 
 void ProfileSyncService::GetAllNodes(
     const base::Callback<void(scoped_ptr<base::ListValue>)>& callback) {
-  // TODO(rlarocque): Should be GetRegisteredDirectoryTypes.
-  const ModelTypeSet directory_types = GetRegisteredDataTypes();
+  ModelTypeSet directory_types = GetRegisteredDirectoryDataTypes();
+  directory_types.PutAll(syncer::ControlTypes());
   scoped_refptr<GetAllNodesRequestHelper> helper =
       new GetAllNodesRequestHelper(directory_types, callback);
 
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 7658f581849926..a742690d6423a2 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -958,8 +958,10 @@ scoped_ptr<base::ListValue> SyncManagerImpl::GetAllNodesForType(
   DirectoryTypeDebugInfoEmitterMap::iterator it = emitter_map->find(type);
 
   if (it == emitter_map->end()) {
-    NOTREACHED() << "Asked to return debug info for invalid type "
-                 << ModelTypeToString(type);
+    // This can happen in some cases.  The UI thread makes requests of us
+    // when it doesn't really know which types are enabled or disabled.
+    DLOG(WARNING) << "Asked to return debug info for invalid type "
+                  << ModelTypeToString(type);
     return scoped_ptr<base::ListValue>();
   }