diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index e5153d6..a075657 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -34,7 +34,7 @@
 		this.name = name;
 	}
 
-	@JSONHint(ignore = true)
+	@JSONHint(ignore=true)
 	public String getPass() {
 		return pass;
 	}
@@ -43,7 +43,7 @@
 		this.pass = pass;
 	}
 
-	@JSONHint(ignore = true)
+	@JSONHint(ignore=true)
 	public boolean isLogin() {
 		return login;
 	}
@@ -61,7 +61,7 @@
 		return token;
 	}
 
-	@JSONHint(ignore = true)
+	@JSONHint(ignore=true)
 	public String getUniqueID() {
 		return uniqueID;
 	}
diff --git a/src/main/java/cactusServer/entities/URIAddressedEntity.java b/src/main/java/cactusServer/entities/URIAddressedEntity.java
index bd5e264..864c840 100644
--- a/src/main/java/cactusServer/entities/URIAddressedEntity.java
+++ b/src/main/java/cactusServer/entities/URIAddressedEntity.java
@@ -2,20 +2,21 @@
 
 import java.net.URI;
 
-public class URIAddressedEntity extends AddressedEntity{
+public class URIAddressedEntity{
 	private URI uri;
+	private Entity body;
 	
 	private URIAddressedEntity() {
 		// JSONDecode���̌Ăяo���p
 	}
 	
 	public URIAddressedEntity(URI uri, Entity body) {
-		super(body);
+		setBody(body);
 		setUri(uri);
 	}
 	
 	public URIAddressedEntity(String str, Entity body) {
-		super(body);
+		setBody(body);
 		setUri(URI.create(str));
 	}
 	
@@ -26,4 +27,12 @@
 	public void setUri(URI uri) {
 		this.uri = uri;
 	}
+
+	public Entity getBody() {
+		return body;
+	}
+
+	public void setBody(Entity body) {
+		this.body = body;
+	}
 }
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index e06fbce..12b953d 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -9,10 +9,11 @@
 
 @Singleton
 public class Accounts {
+	public static final int ACCOUNT_NUM_MAX = 10000;
 	private static Accounts theInstance = null;
-	private ArrayList<Account> accounts = new ArrayList<>(10000);
-	private HashSet<String> userIDSet = new HashSet<>(10000);
-	private HashSet<String> uniqueIDSet = new HashSet<>(10000);
+	private ArrayList<Account> accounts = new ArrayList<>(ACCOUNT_NUM_MAX);
+	private HashSet<String> userIDSet = new HashSet<>(ACCOUNT_NUM_MAX);
+	private HashSet<String> uniqueIDSet = new HashSet<>(ACCOUNT_NUM_MAX);
 	private URIAddressedEntity session;
 
 	private Accounts() {
@@ -102,7 +103,10 @@
 	}
 
 	public Account deleteAccount(String uniqueID) {
-		Account edit = Accounts.getInstance().getAccountToken(uniqueID);
+		Account edit = Accounts.getInstance().getAccountByuniqueID(uniqueID);
+		if(edit == null) {
+			return edit;
+		}
 		userIDSet.remove(edit.getId());
 		uniqueIDSet.remove(edit.getUniqueID());
 		accounts.remove(edit);