properly handling exception
Merge branch 'master' of github.com:choreos/enactment_engine