diff --git a/components/rx/trunk/rxmdi.pas b/components/rx/trunk/rxmdi.pas
index d109ea117..c39225afc 100644
--- a/components/rx/trunk/rxmdi.pas
+++ b/components/rx/trunk/rxmdi.pas
@@ -751,7 +751,8 @@ begin
     FNavPanel.ChildWindowsShowLast;
   FNavPanel.ShowHiddenBtnOnResize;
   CloseAction:=caFree;
-  Owner.RemoveComponent(Self);
+  if Assigned(Owner) then
+    Owner.RemoveComponent(Self);
   FNavPanel.FMainPanel.RemoveControl(Sender as TCustomForm);
   Application.ReleaseComponent(Self);
 end;
diff --git a/components/rx/trunk/rxversinfo.pas b/components/rx/trunk/rxversinfo.pas
index 213af3fe4..90805cc4e 100644
--- a/components/rx/trunk/rxversinfo.pas
+++ b/components/rx/trunk/rxversinfo.pas
@@ -111,7 +111,8 @@ type
 
 
 implementation
-uses FileUtil, resource, resreader, InterfaceBase, rxconst, LazFileUtils, LazUTF8
+uses FileUtil, resource, resreader, InterfaceBase, rxconst, LazFileUtils,
+  LazUTF8, LCLPlatformDef
 {$IFDEF WINDOWS}
   , winpeimagereader
 {$ENDIF}