diff --git a/src/main/java/com/ntlab/irisserver/resources/MemberRest.java b/src/main/java/com/ntlab/irisserver/resources/MemberRest.java
index 6c6d62b..51f62e8 100644
--- a/src/main/java/com/ntlab/irisserver/resources/MemberRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/MemberRest.java
@@ -1,12 +1,11 @@
 package com.ntlab.irisserver.resources;
 
-import com.ntlab.irisserver.entities.Member;
 import com.ntlab.irisserver.entities.Room;
 import com.ntlab.irisserver.models.RoomManager;
 import org.springframework.stereotype.Component;
 
 import javax.ws.rs.*;
-import java.util.List;
+import javax.ws.rs.core.Response;
 
 @Component
 @Path("/rooms")
@@ -18,7 +17,15 @@
                             @FormParam("belongs") String belongs, @FormParam("is-master") boolean is_master) {
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
-        room.changeTeamAndMaster(nickname, belongs, is_master);
+        if(room != null && room.getMember(nickname) != null) {
+            room.changeTeamAndMaster(nickname, belongs, is_master);
+        }else{
+            //部屋がなければエラー
+            var response = Response.status(Response.Status.NO_CONTENT);
+            response.status(404).entity("部屋が存在しません");
+            throw new WebApplicationException(response.build());
+        }
+
         return "変更しました";
     }
 
@@ -28,7 +35,15 @@
     public String deleteMember(@PathParam("rid") String rid, @PathParam("nickname") String nickname) {
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
-        room.deleteMember(nickname);
+        if(room != null && room.getMember(nickname) != null) {
+            room.deleteMember(nickname);
+        }else{
+            //部屋がなければエラー
+            var response = Response.status(Response.Status.NO_CONTENT);
+            response.status(404).entity("部屋が存在しません");
+            throw new WebApplicationException(response.build());
+        }
+
         return "退出しました";
     }
 }
\ No newline at end of file