Handle None being returned from watchdog