Add context to error message
Merge branch 'vagrant-destroy-bug'