diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index 7e1acabd2d..f1a61c103d 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -6155,7 +6155,8 @@ begin
         end;
         {$ENDIF}
 
-        AnUnitInfo.ResourceBaseClass:=GetComponentBaseClass(NewComponent.ClassType);
+        if NewComponent<>nil then
+          AnUnitInfo.ResourceBaseClass:=GetComponentBaseClass(NewComponent.ClassType);
 
         Project1.InvalidateUnitComponentDesignerDependencies;
         AnUnitInfo.Component:=NewComponent;