- restore the starting arg error back to the original intent
- ensure the doc is not sent into the SQL comment in offline mode