diff --git a/packages/fcl-fpcunit/src/fpcunit.pp b/packages/fcl-fpcunit/src/fpcunit.pp
index 69989a4c9d..f420dd353f 100644
--- a/packages/fcl-fpcunit/src/fpcunit.pp
+++ b/packages/fcl-fpcunit/src/fpcunit.pp
@@ -1387,8 +1387,6 @@ class procedure TAssert.AssertException(const AMessage: string; const AFormatArg
 var
   Msg,FailMsg : string;
 begin
-  If AErrorAddr=Nil then
-    AErrorAddr:=CallerAddr;
   FailMsg:='';
   try
     AMethod;
@@ -1414,6 +1412,8 @@ begin
   end;
   if aMessage<>'' then
     Msg:=Format(AMessage, AFormatArgs) + ': '+Msg;
+  If AErrorAddr=Nil then
+    AErrorAddr:=CallerAddr;
   Fail(Msg, AErrorAddr);
 end;
 
@@ -1486,8 +1486,6 @@ var
   Msg,FailMsg : string;
 
 begin
-  If AErrorAddr=Nil then
-    AErrorAddr:=CallerAddr;
   FailMsg:='';
   try
     AMethod;
@@ -1513,6 +1511,8 @@ begin
   end;
   if aMessage<>'' then
     Msg:=Format(AMessage, AFormatArgs) + ': '+Msg;
+  If AErrorAddr=Nil then
+    AErrorAddr:=CallerAddr;
   Fail(Msg, AErrorAddr);
 end;