fix: Better handle waiting for initialization for failure cases. (#314)

fix: Better handle waiting for initialization for failure cases. (#314) #552