Better handling on a failed state setup
Better handling on a failed state setup

In case the setup fails dont mark the flag in_setup. Also
make sure to commit the state

turran/enesim,turran/enesim,turran/enesim,turran/enesim