Add missing import, correct bare exception. `wait_for_fun` can return `False`.
Add missing import, correct bare exception. `wait_for_fun` can return `False`.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt