Marc exceptions

Depends on #23