diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java
index f3bd5c31..9b4479bc 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/list/expboost.java
@@ -101,20 +101,11 @@ public class expboost implements Cmd {
 				return true;
 			}
 
-			boolean found = false;
-			for (Job one : Jobs.getJobs()) {
-				if (one.getName().equalsIgnoreCase(args[1])) {
-					one.addBoost(CurrencyType.EXP, 1.0);
-					found = true;
-					break;
-				}
-			}
+			job.addBoost(CurrencyType.EXP, 1.0);
 
-			if (found) {
-				sender.sendMessage(Jobs.getLanguage().getMessage("command.expboost.output.jobsboostreset", "%jobname%",
-						job.getName()));
-				return true;
-			}
+			sender.sendMessage(Jobs.getLanguage().getMessage("command.expboost.output.jobsboostreset", "%jobname%",
+					job.getName()));
+			return true;
 		}
 
 		Job job = Jobs.getJob(args[0]);
diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java
index 103184dc..5834d80b 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/list/moneyboost.java
@@ -101,20 +101,11 @@ public class moneyboost implements Cmd {
 				return true;
 			}
 
-			boolean found = false;
-			for (Job one : Jobs.getJobs()) {
-				if (one.getName().equalsIgnoreCase(args[1])) {
-					one.addBoost(CurrencyType.MONEY, 1.0);
-					found = true;
-					break;
-				}
-			}
+			job.addBoost(CurrencyType.MONEY, 1.0);
 
-			if (found) {
-				sender.sendMessage(Jobs.getLanguage().getMessage("command.moneyboost.output.jobsboostreset",
-						"%jobname%", job.getName()));
-				return true;
-			}
+			sender.sendMessage(Jobs.getLanguage().getMessage("command.moneyboost.output.jobsboostreset", "%jobname%",
+					job.getName()));
+			return true;
 		}
 
 		Job job = Jobs.getJob(args[0]);
diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java b/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java
index 4f668bfa..c5cf19b7 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/list/pointboost.java
@@ -101,20 +101,11 @@ public class pointboost implements Cmd {
 				return true;
 			}
 
-			boolean found = false;
-			for (Job one : Jobs.getJobs()) {
-				if (one.getName().equalsIgnoreCase(args[1])) {
-					one.addBoost(CurrencyType.POINTS, 1.0);
-					found = true;
-					break;
-				}
-			}
+			job.addBoost(CurrencyType.POINTS, 1.0);
 
-			if (found) {
-				sender.sendMessage(Jobs.getLanguage().getMessage("command.pointboost.output.jobsboostreset",
-						"%jobname%", job.getName()));
-				return true;
-			}
+			sender.sendMessage(Jobs.getLanguage().getMessage("command.pointboost.output.jobsboostreset", "%jobname%",
+					job.getName()));
+			return true;
 		}
 
 		Job job = Jobs.getJob(args[0]);
diff --git a/src/main/java/com/gamingmesh/jobs/container/Boost.java b/src/main/java/com/gamingmesh/jobs/container/Boost.java
index 346e4144..2ccec9ea 100644
--- a/src/main/java/com/gamingmesh/jobs/container/Boost.java
+++ b/src/main/java/com/gamingmesh/jobs/container/Boost.java
@@ -56,17 +56,23 @@ public class Boost {
 
     public double getFinal(CurrencyType BT, boolean percent, boolean excludeExtra) {
 	double r = 0D;
+
 	for (BoostOf one : BoostOf.values()) {
 	    if (!map.containsKey(one))
 		continue;
+
 	    if (excludeExtra && (one == BoostOf.NearSpawner || one == BoostOf.PetPay))
 		continue;
+
+	    if (!map.get(one).isValid())
+		continue;
+
 	    r += map.get(one).get(BT);
 	}
+
 	if (r < -1)
 	    r = -1;
-	if (percent)
-	    return (int) (r * 100);
-	return r;
+
+	return percent ? (int) (r * 100) : r;
     }
 }