[BUGFIX] Don't error out without a timeout