Index: mojo/service_manager/service_manager.cc |
diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc |
index 114f706e9570ae78adc755bd3353e7764597ed04..b6135181c2adfd72946098c1de7a506f54279d54 100644 |
--- a/mojo/service_manager/service_manager.cc |
+++ b/mojo/service_manager/service_manager.cc |
@@ -185,7 +185,9 @@ void ServiceManager::OnServiceFactoryError(ServiceFactory* service_factory) { |
DCHECK(it != url_to_service_factory_.end()); |
delete it->second; |
url_to_service_factory_.erase(it); |
- GetLoaderForURL(url)->OnServiceError(this, url); |
+ ServiceLoader* loader = GetLoaderForURL(url); |
+ if (loader) |
+ loader->OnServiceError(this, url); |
} |
} // namespace mojo |