diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
index bb804101ff..9767147480 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboard.java
@@ -37,7 +37,8 @@ public final class CraftScoreboard implements org.bukkit.scoreboard.Scoreboard {
 
     public Objective getObjective(String name) throws IllegalArgumentException {
         Validate.notNull(name, "Name cannot be null");
-        return new CraftObjective(this, board.getObjective(name));
+        ScoreboardObjective nms = board.getObjective(name);
+        return nms == null ? null : new CraftObjective(this, nms);
     }
 
     public ImmutableSet<Objective> getObjectivesByCriteria(String criteria) throws IllegalArgumentException {