diff --git a/wpilibj/src/main/java/org/wpilib/system/Watchdog.java b/wpilibj/src/main/java/org/wpilib/system/Watchdog.java
index 1493c1bb65..1522c809df 100644
--- a/wpilibj/src/main/java/org/wpilib/system/Watchdog.java
+++ b/wpilibj/src/main/java/org/wpilib/system/Watchdog.java
@@ -274,8 +274,11 @@ public class Watchdog implements Closeable, Comparable<Watchdog> {
         watchdog.m_isExpired = true;
 
         m_queueMutex.unlock();
-        watchdog.m_callback.run();
-        m_queueMutex.lock();
+        try {
+          watchdog.m_callback.run();
+        } finally {
+          m_queueMutex.lock();
+        }
 
         updateAlarm();
       } finally {