diff --git a/components/codetools/examples/ppudependencies.lpr b/components/codetools/examples/ppudependencies.lpr
index d6762ab583..749163e59c 100644
--- a/components/codetools/examples/ppudependencies.lpr
+++ b/components/codetools/examples/ppudependencies.lpr
@@ -42,7 +42,7 @@ var
 begin
   if (Paramcount<1) then begin
     writeln('Usage:');
-    writeln('  ',ParamStr(0),' [fpc] <ppu filename1> ...');
+    writeln('  ',ParamStrUTF8(0),' [fpc] <ppu filename1> ...');
     writeln('  The "fpc" parameter auto generates groups for all fpc units.');
     Halt;
   end;
@@ -54,7 +54,7 @@ begin
   Group:=nil;
   try
     for i:=1 to Paramcount do begin
-      Filename:=ParamStr(i);
+      Filename:=ParamStrUTF8(i);
       if Filename='fpc' then
         Groups.AddFPCGroupsForCurrentCompiler(CleanAndExpandDirectory(GetCurrentDir))
       else begin
diff --git a/components/codetools/ppugraph.pas b/components/codetools/ppugraph.pas
index 8a658a27a7..8803150f2f 100644
--- a/components/codetools/ppugraph.pas
+++ b/components/codetools/ppugraph.pas
@@ -632,8 +632,10 @@ begin
   // search system.ppu
   SystemPPUFilename:=SearchFileInPath('system.ppu',BaseDirectory,FPCSearchPath,
                                       ';',ctsfcDefault);
-  if SystemPPUFilename='' then
+  if SystemPPUFilename='' then begin
+    debugln(['TPPUGroups.AddFPCGroupsForCurrentCompiler BaseDir="',BaseDirectory,'" FPCSearchPath="',FPCSearchPath,'"']);
     raise Exception.Create('TPPUGroups.AddFPCGroupsForCurrentCompiler: system.ppu is not in the FPC search paths');
+  end;
   RTLPPUDirectory:=ExtractFilePath(SystemPPUFilename);
   FPCPPUBaseDir:=ExtractFilePath(ChompPathDelim(RTLPPUDirectory));
   AddFPCGroups(FPCPPUBaseDir);