From 49ab5176fb998d50bc45b5e02aee8a254a38ce27 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 28 Apr 2022 12:49:20 +0100
Subject: [PATCH] More useful return value again

---
 clientapi/routing/routing.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go
index 7b472985c..dd78b25d3 100644
--- a/clientapi/routing/routing.go
+++ b/clientapi/routing/routing.go
@@ -132,11 +132,18 @@ func Setup(
 			if err != nil {
 				return util.ErrorResponse(err)
 			}
+			roomID, ok := vars["room_id"]
+			if !ok {
+				return util.JSONResponse{
+					Code: http.StatusBadRequest,
+					JSON: jsonerror.MissingArgument("Expecting room_id argument."),
+				}
+			}
 			res := &roomserverAPI.PerformAdminEvacuateRoomResponse{}
 			rsAPI.PerformAdminEvacuateRoom(
 				req.Context(),
 				&roomserverAPI.PerformAdminEvacuateRoomRequest{
-					RoomID: vars["room_id"],
+					RoomID: roomID,
 				},
 				res,
 			)