diff --git a/src/base/SMPFunction.cpp b/src/base/SMPFunction.cpp
index 50d24a8c95085340133d867d03c049ddd4a7d84e..07e5c4d94e1fd445a6f08478e8765f7373804a6f 100644
--- a/src/base/SMPFunction.cpp
+++ b/src/base/SMPFunction.cpp
@@ -3536,7 +3536,7 @@ void SMPFunction::EmitStackFrameAnnotations(FILE *AnnotFile, SMPInstr *Instr) {
 					ParentReferentID = global_STARS_program->GetDataReferentID();
 					global_STARS_program->IncrementDataReferentID();
 					if (this->GetLocalVarsSize() != (CurrentRegionBytes + this->OutgoingArgsSize)) {
-						SMP_msg("ERROR: LocalVarsSize: %lu not sum of CurrentRegionBytes: %u  and OutArgsSize: %zu at %llu\n",
+						SMP_msg("ERROR: LocalVarsSize: %lu not sum of CurrentRegionBytes: %u  and OutArgsSize: %zu at %llx\n",
 							this->GetLocalVarsSize(), CurrentRegionBytes, this->OutgoingArgsSize, (unsigned long long) addr);
 					}
 					SMP_fprintf(AnnotFile, "%18llx %6u DATAREF STACK %lu esp + 0 PARENT LocalFrame LOCALFRAME\n",
diff --git a/src/base/SMPInstr.cpp b/src/base/SMPInstr.cpp
index e6400f7b35a3c6db913344d8a7a0650172c27a02..f43f89c75007f94a177168111d50611fba0698f2 100644
--- a/src/base/SMPInstr.cpp
+++ b/src/base/SMPInstr.cpp
@@ -15097,7 +15097,7 @@ bool SMPInstr::BuildCallRTL(void) {
 	else {
 		this->RTL.push_back(TempRT);
 	}
-	return SourceFound;
+	return (SourceFound || ParameterlessCall);
 } // end of SMPInstr::BuildCallRTL()
 
 // Build the RTL for a return instruction, with or without extra bytes popped off stack