diff --git a/main b/main
index fcb6b97..ddb6c62 100755
Binary files a/main and b/main differ
diff --git a/main.c b/main.c
index ee84e1b..48135b8 100644
--- a/main.c
+++ b/main.c
@@ -190,8 +190,10 @@ void teardown(void) {
     FreeSignal(waitForSoundSignalNumber);
   }
   if (TimerIO) {
-    // Wait for our port to be done communicating
-    WaitPort(TimerIO->tr_node.io_Message.mn_ReplyPort);
+    // if the timer's still running, wait for it to be done
+    if (!CheckIO((struct IORequest *)TimerIO)) {
+      WaitIO((struct IORequest *)TimerIO);
+    }
 
     DeleteExtIO((struct IORequest *)TimerIO);
   }