tweaks for exceptions
Signed-off-by:Gabriel Baker <gabriel.baker@gomadtech.com>