Missed a few e.message, changed to e.args[0]