Fixed a bug where waitForDone would Stop a nil timer