Non-Agavi exceptions are now clearly marked as such, closes #673
merge 2eca6ca8d311f2aebbec3bead2d78df8816be9ea, refs #673