diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas
index bf3a846f67..cc72f101b9 100644
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@@ -6100,10 +6100,14 @@ begin
           end;
         end;
       ctnSetType:
-        begin
-          // set of
-          AddAssignment('[]');
-        end;
+        // set of
+        AddAssignment('[]');
+      ctnProcedureType:
+        // address of proc
+        AddAssignment('nil');
+      ctnClass,ctnClassInterface,ctnDispinterface,
+      ctnObjCClass,ctnObjCCategory,ctnObjCProtocol,ctnCPPClass:
+        AddAssignment('nil');
       end;
     end;
   xtChar,
diff --git a/components/codetools/examples/scanexamples/initvars1.pas b/components/codetools/examples/scanexamples/initvars1.pas
index 098eafbcf4..a76f615720 100644
--- a/components/codetools/examples/scanexamples/initvars1.pas
+++ b/components/codetools/examples/scanexamples/initvars1.pas
@@ -23,7 +23,7 @@ end;
 
 procedure TestLots({%H-}s: string; {%H-}c: char; {%H-}p: pointer;
   {%H-}SignalState: TSignalState; {%H-}ShiftState: TShiftState;
-  {%H-}HelpCtx: THelpContext);
+  {%H-}HelpCtx: THelpContext; {%H-}Event: TNotifyEvent; {%H-}E: EStreamError);
 begin
 
 end;
@@ -36,8 +36,10 @@ var
   SignalState: TSignalState;
   ShiftState: TShiftState;
   HelpCtx: THelpContext;
+  Event: TNotifyEvent;
+  E: EStreamError;
 begin
-  TestLots(s,c,p,SignalState,ShiftState,HelpCtx);
+  TestLots(s,c,p,SignalState,ShiftState,HelpCtx,Event,E);
 end;
 
 end.