diff --git a/lcl/include/customcontrol.inc b/lcl/include/customcontrol.inc
index 04209b6845..18f27f93f9 100644
--- a/lcl/include/customcontrol.inc
+++ b/lcl/include/customcontrol.inc
@@ -54,7 +54,7 @@ end;
 
   Destructor for the class.
  ------------------------------------------------------------------------------}
-Destructor TCustomControl.Destroy;
+destructor TCustomControl.Destroy;
 begin
   FCanvas.Free;
   FCanvas:=nil;
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index 29afa87b3a..8b5bcd57e2 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -4189,7 +4189,7 @@ begin
   if DC = 0 then
     DC := BeginPaint(Handle, PS);
 
-  if FDockSite and FUseDockManager then
+  if FDockSite and FUseDockManager and Assigned(FDockManager) then
     FDockManager.PaintSite(DC);
     
   try