diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/FieldObject2d.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/FieldObject2d.java
index 61e4f9e613..67917f2fde 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/FieldObject2d.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/FieldObject2d.java
@@ -25,7 +25,9 @@ public class FieldObject2d implements AutoCloseable {
 
   @Override
   public void close() {
-    m_entry.close();
+    if (m_entry != null) {
+      m_entry.close();
+    }
   }
 
   /**