Handle the destroy on unexisting machines properly
Merge branch 'destroy_unexisting'