diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java b/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
index b416604..b41b615 100644
--- a/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
+++ b/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
@@ -7,8 +7,8 @@
     private String vid;
     private String uid;
     private Calendar upload;
-    private Integer time;//型不明
-    private String data;//型不明
+    private Integer time;
+    private String data;
     private double latitude;
     private double longitude;
     private String title;
@@ -44,10 +44,10 @@
     }
 
 
-    public void editVoicememo(String title, String summary) {
-        setTitle(title);
-        setSummary(summary);
-    }
+//    public void editVoicememo(String title, String summary) {
+//        setTitle(title);
+//        setSummary(summary);
+//    }
 
 
     public String getVid() {
@@ -58,6 +58,7 @@
         this.vid = vid;
     }
 
+
     private String getUid() {
         return uid;
     }
@@ -132,8 +133,13 @@
 
 //    public ArrayList<String> getFavolist(){ return favolist; }
 //
-//    public void checkFavo(String uid){
-//
+//    public boolean checkFavo(String uid){
+//        for (String a : favolist) {
+//            if (a.equals(vid)) {
+//                return true;
+//            }
+//        }
+//        return false;
 //    }
 //
 //    private void addFavolist(String uid){
diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java b/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
index 78e7c79..edcaecb 100644
--- a/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
+++ b/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
@@ -26,6 +26,10 @@
     }
 
     public Voicememo getVoicememo(String vid) {
+        if(vid.equals(null)){
+            return null;
+        }
+
         for (Voicememo a : voicememos) {
             if (a.getVid().equals(vid)) {
                 return a;
@@ -40,9 +44,8 @@
 
 
     public Voicememo createVoicememo(String uid, Integer time, String data, double latitude, double longitude, String title, String summary) {
-
         if (uid == null || time == null || data == null || title == null) {
-            return null;//summary以外が1つでもnullの時、この判定ってvoicememosrestでする？
+            return null;
         }
 
         String vid = createVid();
@@ -54,7 +57,11 @@
     }
 
     public void removeVoicememo(String vid) {
-        Voicememo removeVoicememo = getVoicememo(vid);//？nullの判定いるか
+        if(vid.equals(null)){
+            return;
+        }
+
+        Voicememo removeVoicememo = getVoicememo(vid);
         voicememos.remove(removeVoicememo);
     }