diff --git a/components/ideintf/componenteditors.pas b/components/ideintf/componenteditors.pas
index b26ac40b6b..7d49b606aa 100644
--- a/components/ideintf/componenteditors.pas
+++ b/components/ideintf/componenteditors.pas
@@ -1459,16 +1459,13 @@ var
   I: Integer;
   P: PComponentClassReqRec;
 begin
-  if not Assigned(ComponentClass) or not Assigned(ComponentClassReqList) then
+  if (ComponentClass=Nil) or (ComponentClassReqList=Nil) then
     Exit(Nil);
   for I := 0 to ComponentClassReqList.Count - 1 do
   begin
     P := PComponentClassReqRec(ComponentClassReqList[i]);
     if P^.ComponentClass = ComponentClass then
-    begin
-      Result := P^.RequirementsClass.Create(ComponentClass);
-      Exit;
-    end;
+      Exit(P^.RequirementsClass.Create(ComponentClass));
   end;
   Result := Nil;
 end;
diff --git a/packager/pkgmanager.pas b/packager/pkgmanager.pas
index 728867d2ef..20fa61afbf 100644
--- a/packager/pkgmanager.pas
+++ b/packager/pkgmanager.pas
@@ -4526,11 +4526,11 @@ begin
             CurUnitName:=CurRegComp.ComponentClass.UnitName;
             CurCompReq:=GetComponentRequirements(CurRegComp.ComponentClass);
           end;
-          //DebugLn(['TPkgManager.GetUnitsAndDependenciesForComponents CurUnitName=',CurUnitName]);
+          //DebugLn(['TPkgManager.GetUnitsAndDepsForComps: CurUnitName=',CurUnitName]);
           if CurUnitName='' then
             CurUnitName:=CurRegComp.GetUnitName;
           Assert(CurUnitNames.IndexOf(CurUnitName)<0,
-            'TPkgManager.GetUnitsAndDependenciesForComponents: Name already in CurUnitNames.');
+            'TPkgManager.GetUnitsAndDepsForComps: Name already in CurUnitNames.');
           CurUnitNames.Add(CurUnitName);
           if CurCompReq<>nil then
             CurCompReq.RequiredUnits(CurUnitNames);
@@ -4539,7 +4539,8 @@ begin
             CurUnitName:=CurUnitNames[CurUnitIdx];
             UnitList.Add(CurUnitName);
             PkgFile:=PackageGraph.FindUnitInAllPackages(CurUnitName,true);
-            //DebugLn(['TPkgManager.GetUnitsAndDependenciesForComponents PkgFile=',PkgFile<>nil]);
+            //DebugLn(['            GetUnitsAndDepsForComps: CurUnitName=',CurUnitName,
+            //         ', PkgFile=', PkgFile.Unit_Name]);
             if PkgFile=nil then
               PkgFile:=TPkgComponent(CurRegComp).PkgFile;
             if PkgFile<>nil then