diff --git a/components/buildintf/ideoptionsintf.pas b/components/buildintf/ideoptionsintf.pas
index 567716be3c..10f571cd95 100644
--- a/components/buildintf/ideoptionsintf.pas
+++ b/components/buildintf/ideoptionsintf.pas
@@ -281,9 +281,8 @@ implementation
 procedure RegisterOptionsGroup(AGroupIndex: Integer; AGroupClass: TAbstractIDEOptionsClass);
 // Like function RegisterIDEOptionsGroup in IDEOptEditorIntf (IdeIntf) but does not return anything.
 begin
-  if OnRegisterGroup=Nil then
-    raise Exception.Create('RegisterOptionsGroup: OnRegisterGroup=Nil');
-  OnRegisterGroup(AGroupIndex, AGroupClass);
+  if Assigned(OnRegisterGroup) then
+    OnRegisterGroup(AGroupIndex, AGroupClass);
 end;
 
 { TIDEEnvironmentOptions }
diff --git a/ide/lazbuild.lpr b/ide/lazbuild.lpr
index c962d976aa..719c744244 100644
--- a/ide/lazbuild.lpr
+++ b/ide/lazbuild.lpr
@@ -37,8 +37,6 @@ uses
   LCLPlatformDef, Forms,
   // Codetools
   CodeCache, CodeToolManager, DefineTemplates, FileProcs,
-  // IdeIntf
-  IDEOptEditorIntf, // Initialize RegisterOptionsGroup event
   // BuildIntf
   BaseIDEIntf, MacroIntf, PackageIntf, LazMsgWorker, ProjectIntf, IDEExternToolIntf,
   CompOptsIntf, IDEOptionsIntf, PackageDependencyIntf,