Fix await return value exception

[VivianDelannoyEtu]

Throws a exception when the waiting time detectably elapsed before return from the method.