diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
index a40d6ea69..3d9cacaf0 100644
--- a/lib/remote/jsonrpcconnection.cpp
+++ b/lib/remote/jsonrpcconnection.cpp
@@ -209,9 +209,10 @@ void JsonRpcConnection::MessageHandler(const String& jsonString)
 		ApiFunction::Ptr afunc = ApiFunction::GetByName(method);
 
 		if (!afunc)
-			BOOST_THROW_EXCEPTION(std::invalid_argument("Function '" + method + "' does not exist."));
-
-		resultMessage->Set("result", afunc->Invoke(origin, message->Get("params")));
+			Log(LogWarning, "JsonRpcConnection")
+			    << "Call to non-existent function '" << method << "' from endpoint '" << m_Identity << "'.";
+		else
+			resultMessage->Set("result", afunc->Invoke(origin, message->Get("params")));
 	} catch (const std::exception& ex) {
 		/* TODO: Add a user readable error message for the remote caller */
 		String diagInfo = DiagnosticInformation(ex);