Make message clearer when a machine and instance are not there
Merge branch 'master' of git://github.com/weblabdeusto/weblabdeusto
Merge branch 'master' into new_romie