Fix/rollback exception

Closes #149.