Fix failing over to another bucket/host
Follow up (accessed => checked)
Merge pull request #1 from cmaion/master

Fix failover to a differrent bucket/host