diff --git a/compiler/symsym.inc b/compiler/symsym.inc
index 7a763b779a..6e58a0db5c 100644
--- a/compiler/symsym.inc
+++ b/compiler/symsym.inc
@@ -409,7 +409,9 @@
     destructor tprocsym.done;
 
       begin
-         check_forward;
+         { don't check if errors !! }
+         if Errorcount=0 then
+           check_forward;
          tsym.done;
       end;
 
@@ -444,9 +446,6 @@
       var
          pd : pprocdef;
       begin
-         { don't check if errors !! }
-         if Errorcount>0 then
-           exit;
          pd:=definition;
          while assigned(pd) do
            begin
@@ -457,7 +456,10 @@
                        demangledparas(pd^.demangled_paras))
                    else
                      MessagePos1(fileinfo,sym_e_forward_not_resolved,name+pd^.demangled_paras);
+                   { Turn futher error messages off }
+                   pd^.forwarddef:=false;
                 end;
+
               pd:=pd^.nextoverloaded;
            end;
       end;
@@ -2016,7 +2018,10 @@
 
 {
   $Log$
-  Revision 1.87  1999-05-08 19:52:38  peter
+  Revision 1.88  1999-05-10 09:01:43  peter
+    * small message fixes
+
+  Revision 1.87  1999/05/08 19:52:38  peter
     + MessagePos() which is enhanced Message() function but also gets the
       position info
     * Removed comp warnings
diff --git a/compiler/tccal.pas b/compiler/tccal.pas
index 68d9c185ff..ddf52b2dca 100644
--- a/compiler/tccal.pas
+++ b/compiler/tccal.pas
@@ -692,7 +692,7 @@ implementation
                           internalerror(39393)
                          else
                           CGMessage3(type_e_wrong_parameter_type,tostr(lastpara),
-                             lastparatype^.typename,pt^.resulttype^.typename);
+                             pt^.resulttype^.typename,lastparatype^.typename);
 {$else}
                           CGMessage1(parser_e_wrong_parameter_type,tostr(lastpara));
 {$endif}
@@ -1153,7 +1153,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.39  1999-05-02 09:35:46  florian
+  Revision 1.40  1999-05-10 09:01:45  peter
+    * small message fixes
+
+  Revision 1.39  1999/05/02 09:35:46  florian
     + method message handlers which contain an explicit self can't be called
       directly anymore
     + self is now loaded at the start of the an message handler with an explicit