Make sure assignment does not leave host with wrong state on exception
Merge pull request #87 from pitr-ch/master

Make sure assignment does not leave host with wrong state on exception