diff --git a/dynmap_honeypot/main.py b/dynmap_honeypot/main.py
index bba68bb..6b88f68 100644
--- a/dynmap_honeypot/main.py
+++ b/dynmap_honeypot/main.py
@@ -12,8 +12,16 @@ else:
     webhook = None
 
 @app.post("/up/sendmessage")
-async def message_endpoint(request: Request, name: str = Body(str), message: str = Body(str)):
-    ip = request.headers['X-Forwarded-For']
+# async def message_endpoint(request: Request, name: str = Body(str), message: str = Body(str)):
+async def message_endpoint(request: Request):
+    ip = request.headers['X-Forwarded-For'] if 'X-Forwarded-For' in request.headers else request.client.host
+    try:
+        data = await request.json()
+        name = data["name"] if "name" in data else "<none>"
+        message = data["message"] if "message" in data else "<none>"
+    except:
+        logger.info(f"{ip}: invalid body: {request._body}")
+        return {"error": "invalid body"}
     if webhook:
         embed = DiscordEmbed(
                 title="message received", 
@@ -29,7 +37,7 @@ async def message_endpoint(request: Request, name: str = Body(str), message: str
 
 @app.get("/up/configuration")
 async def configuration_endpoint(request: Request):
-    ip = request.headers['X-Forwarded-For']
+    ip = request.headers['X-Forwarded-For'] if 'X-Forwarded-For' in request.headers else request.client.host
     if webhook:
         embed = DiscordEmbed(title="received configuration request")
         embed.add_embed_field(name="address", value=ip)