add org/user to error and trace info