Changes for exceptions to include stack trace