Merge pull request #40 from juju/deploy-errors