diff --git a/.gitattributes b/.gitattributes
index 85a92d3105..36396c8d5a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9542,6 +9542,7 @@ tests/test/cg/tcnvstr3.pp svneol=native#text/plain
 tests/test/cg/tcppcl1.pp svneol=native#text/plain
 tests/test/cg/tcppcl2.pp svneol=native#text/plain
 tests/test/cg/tctr1.pp svneol=native#text/plain
+tests/test/cg/tctr1a.pp svneol=native#text/plain
 tests/test/cg/tderef.pp svneol=native#text/plain
 tests/test/cg/tdivz1.pp svneol=native#text/plain
 tests/test/cg/tdivz2.pp svneol=native#text/plain
diff --git a/compiler/psub.pas b/compiler/psub.pas
index 57bc4cefa8..83acd24599 100644
--- a/compiler/psub.pas
+++ b/compiler/psub.pas
@@ -284,7 +284,6 @@ implementation
               begin
                 if is_class(current_structdef) then
                   begin
-                    include(current_procinfo.flags,pi_needs_implicit_finally);
                     srsym:=search_struct_member(current_structdef,'NEWINSTANCE');
                     if assigned(srsym) and
                        (srsym.typ=procsym) then
@@ -544,6 +543,16 @@ implementation
                       occurred then we will execute afterconstruction,
                       otherwise we won't (the exception will jump over us) }
                     addstatement(newstatement,tocode);
+                    { if implicit finally node wasn't created, then exit label and
+                      finalization code must be handled here and placed before
+                      afterconstruction }
+                    if not ((pi_needs_implicit_finally in flags) and
+                      (cs_implicit_exceptions in current_settings.moduleswitches)) then
+                      begin
+                        include(tocode.flags,nf_block_with_exit);
+                        addstatement(newstatement,final_asmnode);
+                      end;
+
                     { Self can be nil when fail is called }
                     { if self<>nil and vmt<>nil then afterconstruction }
                     addstatement(newstatement,cifnode.create(
@@ -615,7 +624,11 @@ implementation
         codestatement,
         newstatement : tstatementnode;
         oldfilepos   : tfileposinfo;
+        is_constructor: boolean;
       begin
+        is_constructor:=assigned(procdef.struct) and
+          (procdef.proctypeoption=potype_constructor);
+
         oldfilepos:=current_filepos;
         { Generate code/locations used at start of proc }
         current_filepos:=entrypos;
@@ -634,6 +647,13 @@ implementation
           depending on the implicit finally we need to add
           an try...finally...end wrapper }
         newblock:=internalstatements(newstatement);
+        { initialization is common for all cases }
+        addstatement(newstatement,loadpara_asmnode);
+        addstatement(newstatement,stackcheck_asmnode);
+        addstatement(newstatement,entry_asmnode);
+        addstatement(newstatement,init_asmnode);
+        addstatement(newstatement,bodyentrycode);
+
         if (cs_implicit_exceptions in current_settings.moduleswitches) and
            (pi_needs_implicit_finally in flags) and
            { but it's useless in init/final code of units }
@@ -647,12 +667,7 @@ implementation
             { Generate code that will be in the try...finally }
             finalcode:=internalstatements(codestatement);
             addstatement(codestatement,final_asmnode);
-            { Initialize before try...finally...end frame }
-            addstatement(newstatement,loadpara_asmnode);
-            addstatement(newstatement,stackcheck_asmnode);
-            addstatement(newstatement,entry_asmnode);
-            addstatement(newstatement,init_asmnode);
-            addstatement(newstatement,bodyentrycode);
+
             current_filepos:=entrypos;
             wrappedbody:=ctryfinallynode.create_implicit(
                code,
@@ -672,16 +687,15 @@ implementation
           end
         else
           begin
-            maybe_add_constructor_wrapper(code,false);
-            addstatement(newstatement,loadpara_asmnode);
-            addstatement(newstatement,stackcheck_asmnode);
-            addstatement(newstatement,entry_asmnode);
-            addstatement(newstatement,init_asmnode);
-            addstatement(newstatement,bodyentrycode);
+            { constructors need destroy-on-exception code even if they don't
+              have managed variables/temps }
+            maybe_add_constructor_wrapper(code,
+              cs_implicit_exceptions in current_settings.moduleswitches);
             addstatement(newstatement,code);
             addstatement(newstatement,exitlabel_asmnode);
             addstatement(newstatement,bodyexitcode);
-            addstatement(newstatement,final_asmnode);
+            if not is_constructor then
+              addstatement(newstatement,final_asmnode);
           end;
         do_firstpass(tnode(newblock));
         code:=newblock;
diff --git a/tests/test/cg/tctr1a.pp b/tests/test/cg/tctr1a.pp
new file mode 100644
index 0000000000..dd638d7e00
--- /dev/null
+++ b/tests/test/cg/tctr1a.pp
@@ -0,0 +1,30 @@
+{$mode objfpc}{$h+}
+// Differs from tctr1.pp in the following directive:
+{$implicitexceptions off}
+
+type
+  tobj=class(TObject)
+    ffield:boolean;
+    constructor Create;
+    procedure AfterConstruction;override;
+  end;
+
+{ Exit statement in constructor must not jump over AfterConstruction! }
+constructor tobj.Create;
+begin
+  exit;
+end;
+ 
+procedure tobj.AfterConstruction;
+begin
+  ffield:=true;
+end;
+ 
+ 
+var
+  o: tobj;
+begin
+  o:=tobj.create;
+  if not o.ffield then
+    Halt(1);
+end.