Avoid logging stack trace in cases where we plan on special handling
Merge remote-tracking branch 'derek/master'