Exit on error
Less ugly condition
Fix: unable to revert to original state if untracked files exist