Non-Agavi exceptions are now clearly marked as such, closes #673