added `safe wait for`s

closes gh-66