Allow `waitOn` to be falsy

Pull request for #136.