diff --git a/src/scripting/codegeneration/codegen.cpp b/src/scripting/codegeneration/codegen.cpp
index 908850e3e..ab0bb96e1 100644
--- a/src/scripting/codegeneration/codegen.cpp
+++ b/src/scripting/codegeneration/codegen.cpp
@@ -6820,6 +6820,16 @@ FxExpression *FxFunctionCall::Resolve(FCompileContext& ctx)
 	ABORT(ctx.Class);
 	bool error = false;
 
+	for (auto a : ArgList)
+	{
+		if (a == nullptr)
+		{
+			ScriptPosition.Message(MSG_ERROR, "Empty function argument.");
+			delete this;
+			return nullptr;
+		}
+	}
+
 	PFunction *afd = FindClassMemberFunction(ctx.Class, ctx.Class, MethodName, ScriptPosition, &error);
 
 	if (afd != nullptr)
@@ -7071,6 +7081,16 @@ FxExpression *FxMemberFunctionCall::Resolve(FCompileContext& ctx)
 
 	PClass *ccls = nullptr;
 
+	for (auto a : ArgList)
+	{
+		if (a == nullptr)
+		{
+			ScriptPosition.Message(MSG_ERROR, "Empty function argument.");
+			delete this;
+			return nullptr;
+		}
+	}
+
 	if (Self->ExprType == EFX_Identifier)
 	{
 		ccls = PClass::FindClass(static_cast<FxIdentifier *>(Self)->Identifier);