diff --git a/src/Main/Base/Project/Util/SharpDevelopServiceContainer.cs b/src/Main/Base/Project/Util/SharpDevelopServiceContainer.cs
index cb85ac4348..af97190bf2 100644
--- a/src/Main/Base/Project/Util/SharpDevelopServiceContainer.cs
+++ b/src/Main/Base/Project/Util/SharpDevelopServiceContainer.cs
@@ -161,9 +161,8 @@ namespace ICSharpCode.SharpDevelop
 		{
 			Type serviceType = typeof(T);
 			lock (services) {
-				object instance;
-				if (services.TryGetValue(serviceType, out instance)) {
-					return Task.FromResult((T)instance);
+				if (services.ContainsKey(serviceType)) {
+					return Task.FromResult((T)GetService(serviceType));
 				} else {
 					object taskCompletionSource;
 					if (taskCompletionSources.TryGetValue(serviceType, out taskCompletionSource)) {