$waitPromise should handle gracefully non promise.