Non-Agavi exceptions are now clearly marked as such, closes #749
merge c87519e52433760cb1440afeb13ee9cea32a47ce, refs #749