From 2bb79640f79d6ba2e19b9498edcbb619f7de6d31 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 28 Apr 2022 12:47:29 +0100
Subject: [PATCH] More useful return error rather than a panic

---
 roomserver/internal/perform/perform_admin.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roomserver/internal/perform/perform_admin.go b/roomserver/internal/perform/perform_admin.go
index 9fe765945..63186c2bb 100644
--- a/roomserver/internal/perform/perform_admin.go
+++ b/roomserver/internal/perform/perform_admin.go
@@ -41,10 +41,10 @@ func (r *Admin) PerformAdminEvacuateRoom(
 		}
 		return
 	}
-	if roomInfo.IsStub {
+	if roomInfo == nil || roomInfo.IsStub {
 		res.Error = &api.PerformError{
-			Code: api.PerformErrorBadRequest,
-			Msg:  "room is stub",
+			Code: api.PerformErrorNoRoom,
+			Msg:  fmt.Sprintf("Room %s not found", req.RoomID),
 		}
 		return
 	}