diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 12b953d..ca25106 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -85,7 +85,7 @@
 	}
 
 	public URIAddressedEntity loginAccount(String userID, String userPass) {
-		if (getAccountByID(userID).getPass().equals(userPass)) {
+		if (getAccountByID(userID) != null && getAccountByID(userID).getPass().equals(userPass)) {
 			Accounts.getInstance().getAccountByID(userID).setLogin(true);
 			Accounts.getInstance().getAccountByID(userID).formToken();
 			session = new URIAddressedEntity(
@@ -104,7 +104,7 @@
 
 	public Account deleteAccount(String uniqueID) {
 		Account edit = Accounts.getInstance().getAccountByuniqueID(uniqueID);
-		if(edit == null) {
+		if (edit == null) {
 			return edit;
 		}
 		userIDSet.remove(edit.getId());
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index c4abff3..cb3371c 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 
@@ -11,23 +10,16 @@
 
 @Path("/accounts")
 public class AccountsRest {
-	private HttpServletResponse response;
-
 	@PUT
 	@Produces(MediaType.APPLICATION_JSON)
 	public URIAddressedEntity loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
 		URIAddressedEntity session = Accounts.getInstance().loginAccount(userID, userPass);
-		if(session != null) {
+		if (session != null) {
 			return session;
+		} else {
+			throw new WebApplicationException(400);
 		}
-		else {
-			int status = 400;
-			return null;
-		}
-		
 	}
-	
-
 
 	@POST
 	@Path("/logout")
@@ -40,7 +32,12 @@
 	@Produces(MediaType.APPLICATION_JSON)
 	public URIAddressedEntity createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
 			@FormParam("userPass") String userPass) {
-		return Accounts.getInstance().createAcount(userID, userName, userPass);
+		URIAddressedEntity editAccount = Accounts.getInstance().createAcount(userID, userName, userPass);
+		if(editAccount != null) {
+			return editAccount;
+		}else {
+			throw new WebApplicationException(409);
+		}
 	}
 
 	@GET
@@ -49,17 +46,21 @@
 	public Account getAccount(@PathParam("uniqueID") String uniqueID) {
 		return Accounts.getInstance().getAccountByuniqueID(uniqueID);
 	}
-	
+
 	@DELETE
 	@Path("/{uniqueID}")
 	@Produces(MediaType.APPLICATION_JSON)
-	public Account deleteAccount(@FormParam("uniqueID") String uniqueID) {
-		return Accounts.getInstance().deleteAccount(uniqueID);
+	public Account deleteAccount(@PathParam("uniqueID") String uniqueID) {
+		if (Accounts.getInstance().getAccountByuniqueID(uniqueID) != null) {
+			return Accounts.getInstance().deleteAccount(uniqueID);
+		} else {
+			throw new WebApplicationException(400);
+		}
 	}
-	
+
 	@GET
 	@Produces(MediaType.APPLICATION_JSON)
-	public ArrayList<Account> getAccounts(){
+	public ArrayList<Account> getAccounts() {
 		return Accounts.getInstance().getAccounts();
 	}