diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
index 910a016087..dd119c8521 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SPI.java
@@ -544,8 +544,10 @@ public class SPI {
    * Frees the accumulator.
    */
   public void freeAccumulator() {
-    m_accum.free();
-    m_accum = null;
+    if (m_accum != null) {
+      m_accum.free();
+      m_accum = null;
+    }
     freeAuto();
   }