WhenTimeout returns time.Time, not error
WhenTimeout returns time.Time, not error
Versioning improvement