fixed issue with annoying Collection.sync future timeout
refactored Future-related behaviour in couple of places in Collection to made it more consistent in case of errors