diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java
index 4d564bc..c0c5865 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.UUID;
 import javax.inject.Singleton;
+import javax.ws.rs.WebApplicationException;
 
 import com.example.cosmos_serversb.entities.*;
 import org.hibernate.Session;
@@ -94,8 +95,7 @@
                 return findUser;
             }
         }
-        //一致しない場合は返す必要がないのでnull
-        return null;
+        throw  new WebApplicationException(404);
     }
 
     public static User getUserByToken(String token) {
@@ -106,9 +106,9 @@
 
     public static DeleteResult deleteUser(String uId) {
         Session session = SessionManager.getInstance().getSession();
-        Request deleteRequest = (Request) session.load(Request.class, uId);
-        if(deleteRequest != null){
-            session.delete(deleteRequest);
+        User deleteUser = (User) session.load(User.class, uId);
+        if(deleteUser != null){
+            session.delete(deleteUser);
             System.out.println("massage: Already Deleted");
         }
         return DeleteResult.SUCCESS;
@@ -120,13 +120,13 @@
             //tokenを作成後値を返す
             return testtoken;//testToken
         }else{
-            return null;
+            throw  new WebApplicationException(401);
         }
     }
 
     public static DeleteResult logout(String uId,String token) {
         Session session = SessionManager.getInstance().getSession();
-        List usersList = session.createQuery( "from logout" ).list();
+        List usersList = session.createQuery( "from User" ).list();
         for ( User user : (List<User>) usersList ) {
             if (user.getuId().equals(uId)) {
                 if (Users.getInstance().getUserByToken(token).uId == null) {
@@ -137,7 +137,7 @@
                 }
             }
         }
-        return null;
+        throw  new WebApplicationException(400);
     }
 
     public static boolean checkToken(String uId, String token) {
@@ -154,6 +154,5 @@
         } else {
             return false;
         }
-
     }
 }
\ No newline at end of file