Fix wrong error messages, add snapshotting of new machines