diff --git a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
index a571337..e2a6a9d 100644
--- a/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
+++ b/src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
@@ -11,19 +11,19 @@
 public class UserRepository {
     private final HashMap<String, User> userMap = new HashMap<>();
 
-    public User addUser(String userId, String password) {
+    public User addUser(String userId, String password) {//アカウント新規作成時追加
         User u = new User(userId, password);
         userMap.put(userId, u);
         return u;
     }
 
-    public User addUser(String userId, String name, String password, String email, String icon) {
+    public User addUser(String userId, String name, String password, String email, String icon) {//アカウント追加
         User u = new User(userId, name, password, email, icon);
         userMap.put(userId, u);
         return u;
     }
 
-    public User getUser(String userId) {
+    public User getUser(String userId) {//ユーザー情報取得
         return userMap.get(userId);
     }
 
@@ -42,8 +42,11 @@
         return user.getFriendPairs();
     }
 
-    public void deleteFriendPair(String userId, FriendPair pair) {
+    public boolean deleteFriendPair(String userId, FriendPair pair) {
         User user = getUser(userId);
-        user.getFriendPairs().remove(pair);
+        if (user == null) return false;
+        if (pair == null) return false;
+        boolean result =  user.getFriendPairs().remove(pair);
+        return result;
     }
-}
+}
\ No newline at end of file