Make digital ocean handle errors a little better
Merge pull request #9078 from techhat/digitalocean

Make digital ocean handle errors a little better