handle exceptions thrown from commitRequest()
rework to allow for arbitrary upstream values
Merge branch 'escape-upstream' into staging