Starting splitting PPC to modules.

1 files changed, 9 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
index 4a344ebc9..c10c550cb 100644
--- a/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
+++ b/Software/Visual_Studio/Tango.Core/DI/TangoIOC.cs
@@ -11,7 +11,7 @@ namespace Tango.Core.DI
     /// Represents the default Tango IOC container.
     /// </summary>
     /// <seealso cref="Tango.Core.DI.ITangoIOC" />
-    public class TangoIOC : ITangoIOC
+    public class TangoIOC : ExtendedObject, ITangoIOC
     {
         private class RegisteredType
         {
@@ -179,7 +179,14 @@ namespace Tango.Core.DI
             }
             else
             {
-                throw new InvalidOperationException(String.Format("Requested type '{0}' could not be found.", type.Name));
+                if (!DesignMode)
+                {
+                    throw new InvalidOperationException(String.Format("Requested type '{0}' could not be found.", type.Name));
+                }
+                else
+                {
+                    return null;
+                }
             }
         }