simplified exceptions

Forgot to switch branch...